feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
35,790 Commits 108 Branches 368 Tags
1d050affef1ab463c20851148c39b7400de03fe9
Commit Graph

35790 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas Hartmann
1d050affef QmlDesigner: Removing qDebug 
Cleaning forgotten qDebug calls.

Change-Id: I2904fd5c4d426580cfb6c4721090e9e814e0bd70
Reviewed-by: Nikita Baryshnikov <nib952051@gmail.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2014-05-21 09:05:14 +02:00
Orgad Shaneh
04f0891fb4 TextEditor: Avoid repetitive calls 
Change-Id: Iae1e32c1c078bbc6605b8baa8d856cd30f84b239
Reviewed-by: David Schulz <david.schulz@digia.com>
 2014-05-21 07:40:28 +02:00
Thiago Macieira
d79b47a6b8 Fix warnings in release mode (unused variables) 
qmljsimportdependencies.cpp:937:18: warning: variable ‘found’ set but not used [-Wunused-but-set-variable]
findtoolbar.cpp:665:18: warning: unused variable ‘w’ [-Wunused-variable]

Change-Id: I75930fa6f5a7cbb91d9c39e6808f8c3ce913327e
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2014-05-20 20:52:09 +02:00
Thomas Hartmann
31deb76bd5 QmlDesigner.PropertyEditor: Fix for LineEdit if editing a gradient 
Change-Id: I7f83d7736b7dd0268420612ad1bd0f3b43c8617e
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2014-05-20 17:50:56 +02:00
Thomas Hartmann
7cd689e7fc QmlDesigner.PropertyEditor: Select first color if adding gradient 
Change-Id: Idd4c7052e3dc4967fb2be243698c0ac023b1cbf9
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2014-05-20 17:48:49 +02:00
Thomas Hartmann
e6c37866f2 QmlDesigner.PropertyEditor: Fix property signal 
Change-Id: Ibfc48328feda50ae39fd96b038690fe4a5a2c123
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2014-05-20 15:30:34 +02:00
Eike Ziller
270e8fe537 Merge remote-tracking branch 'origin/3.1' 
Conflicts:
	src/plugins/ios/iosdeploystep.cpp

Change-Id: I97c80d288d7af30f4bf64509a09e0fe2e3b85f6f
 2014-05-20 14:44:31 +02:00
Robert Loehning
88d76de059 Squish: Remove pointless object 
Change-Id: I5acd2d0dfceffa9c5f693cec0dbb4f54207aa9da
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-05-20 14:11:41 +02:00
Robert Loehning
4b00139b29 Squish: Set timeout for waitFor 
Change-Id: I669a5974c173aca6341c49d9d32044a40da42c9d
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-05-20 14:11:17 +02:00
El Mehdi Fekari
7c672821cd Qnx: Correctly set QT_QPA_FONTDIR 
The value should contain one unique directory
where the fonts are located.

Change-Id: I3471abcf3052a181c20dcc1bc2903d111764063b
Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2014-05-20 14:05:44 +02:00
Thomas Hartmann
049a10fa40 QmlDesigner.PropertyEditor: Allow more space for labels. 
On some systems the fonts are eally huge, so we have
to allow much more space for the leading label.

Task-number: QTCREATORBUG-12106
Change-Id: I7ad6687c4af15b2126efe2c3bd8284d36d9ac633
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2014-05-20 13:40:28 +02:00
Orgad Shaneh
dcf807d712 Valgrind: Pass const vector by reference 
Change-Id: I1625d52a6743887db80ed9943a888d094b2d8012
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-05-20 13:29:19 +02:00
Thomas Hartmann
1c2cb4bea0 QmlDesigner.PropertyEditor: Final fixes for gradient editing 
We react to selection change now and keep the selection.

Change-Id: I847b8cf308277df92295822f9cd18ebb58cc2ba0
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2014-05-20 13:02:11 +02:00
Thomas Hartmann
95b0f52c1a QmlDesigner: Remove qDebug 
Change-Id: I11dfccf77ba413f602edfe16e384c47c68081be5
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2014-05-20 13:01:44 +02:00
hjk
3ae6c09714 Debugger: Regression cleanup 
Sneaked in with 40052046fd.

Change-Id: I711c5b8e6869647a447a5f17f693de571b5f0337
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-05-20 13:01:31 +02:00
Orgad Shaneh
0360017b2f QmlJSEditor: Remove redundant null test 
Change-Id: I923fc58d1d7d305033584b33668915a6e7daba36
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2014-05-20 12:48:28 +02:00
Orgad Shaneh
e7a7c02b4d DiffEditor: Pass const lists and string by reference 
Change-Id: I6acdc4db61aeed1353bed2207736268dfabf3f17
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
 2014-05-20 12:36:19 +02:00
Orgad Shaneh
fb82943e6f QMakePM: Deduplicate comparison 
Change-Id: I687e5cef4eda5baf20c46cda1bb41882c952a849
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
 2014-05-20 12:35:21 +02:00
jkobus
48aefde7ba Move patch command out of VcsPlugin 
It will be needed soon inside DiffEditor plugin.
Move "Patch command" setting out of Version Control | General
into Environment | General | System.

Introduce PatchTool class, which hold the patch command
setting and a method for applying patches (runPatch() - moved
from VcsBasePlugin).

Change-Id: I9de94358ccd5c6e31ac2beefc27305c5111d67bb
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
 2014-05-20 11:56:40 +02:00
Orgad Shaneh
ba29d9f9b5 RemoteLinux: Pass some values by reference 
Change-Id: I59c6442261fe2c16f78a18271659ad6f69d78a48
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
 2014-05-20 11:51:26 +02:00
Orgad Shaneh
7ab6997d70 CPaster: Pass const list by reference 
Change-Id: Ia81206925dd97dc402a8f4f815c927ffefcf3fdc
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
 2014-05-20 11:47:47 +02:00
Orgad Shaneh
ad13c91200 Utils: Avoid repetitive calls 
Change-Id: Ie0a28f41c8e4309c62d87c90c462846f1eb9a194
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2014-05-20 11:47:42 +02:00
Orgad Shaneh
e665366a64 Core: Remove unused assignment 
cmd is not used before it's assigned again

Change-Id: I153861cb4733b3163dbcd594229578c3f8cf918a
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-05-20 11:47:24 +02:00
Christian Stenger
53999b89fe Ios: Fix Qt4 compile 
Change-Id: Idd632e8c53472e86d26c339c3fe0dae27405711b
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
 2014-05-20 11:44:45 +02:00
Orgad Shaneh
8a42154f24 QmlPuppet: Remove duplicate condition 
Change-Id: I2a521aa08347d83b236d490e698081e552381ed7
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2014-05-20 11:44:02 +02:00
Orgad Shaneh
245c0deb69 TextEditor: Pass some const values by reference 
Change-Id: I059ee93d986425ebf6896bfad92845246d351831
Reviewed-by: David Schulz <david.schulz@digia.com>
 2014-05-20 11:43:47 +02:00
Orgad Shaneh
03c1d6ee87 QmlProfiler: Pass const vector by reference 
Change-Id: I3af38eeeec3c59d52543f28d5e5fa1f4ca604fcd
Reviewed-by: Ulf Hermann <ulf.hermann@digia.com>
 2014-05-20 11:42:26 +02:00
Orgad Shaneh
86319398b6 TextEditor: Remove duplicate condition 
Change-Id: I606276670bb78f5e705bbe98cd4c7e5f59a7723e
Reviewed-by: David Schulz <david.schulz@digia.com>
 2014-05-20 11:42:09 +02:00
Orgad Shaneh
995cb365c4 QmlProfiler: Avoid repetitive calls 
Change-Id: Iaf84cccf864b3975e6f6fe282a97fb5ea70e7a93
Reviewed-by: Ulf Hermann <ulf.hermann@digia.com>
 2014-05-20 11:41:39 +02:00
Orgad Shaneh
f470db1e23 ProjectExplorer: Add parentheses to clarify precedence 
Change-Id: Ife6fc962ff8fbea6cf2020fa888269eefce2c4d4
Reviewed-by: David Schulz <david.schulz@digia.com>
 2014-05-20 11:41:23 +02:00
Orgad Shaneh
91fbf28ec6 SSH: Avoid repetitive calls 
Change-Id: I3a1803cc57050c6fb90c5d143ffb2d4e98765be3
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
 2014-05-20 11:41:02 +02:00
Orgad Shaneh
7e794d66d2 Analyzer: Remove unused assignment 
Change-Id: Ib5718a25fb86a2f4443c8fb1312f31dd847695d2
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-05-20 11:38:01 +02:00
Thomas Hartmann
001b93d9cb QmlDesigner.PropertyEditor: Fix ComboBox 
We have to wait until the model is properly set until we react
to currentTextChanged. We also have to guard against binding loops.

Task-number: QTCREATORBUG-12257
Change-Id: Id602f6f192962e83a6166bf24a0711b22baa7868
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2014-05-20 10:57:15 +02:00
Thomas Hartmann
e3ddc5ffc9 QmlDesigner.MetaInfo: Support dot properties defined as components 
We can resolve the ObjectValue by using the context and document.

Change-Id: I494737b67e67ce161ef3141356cdb1a380df50ce
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
 2014-05-20 10:57:00 +02:00
Thomas Hartmann
4390a0f11f QmlDesigner.PropertyEditor: Adding QmlModelNodeProxy 
We currently use the QmlAnchorBindingProxy in cases that are
not related to anchors. Instead this patch adds a separate object for
ModelNode that we can use instead. This also adds a proper
selectionChanged() signal.

Change-Id: Idbcff3a8efcb3343c9d9b379f1d35ab30b02dc50
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2014-05-20 10:56:48 +02:00
Orgad Shaneh
41ac37dd01 CDB: Pass string by reference 
Change-Id: Iae3554e70105de1a526932b5c3f8c36485c1eab7
Reviewed-by: David Schulz <david.schulz@digia.com>
 2014-05-20 10:45:43 +02:00
Orgad Shaneh
6aa1f3ccc0 Debugger: Pass Abi as const reference 
Change-Id: I9f7ef9becc1509cea9ee8f9284a09fc10fdb150f
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-05-20 10:24:24 +02:00
Orgad Shaneh
8e6e8c6219 Debugger: Fix condition 
Change-Id: Iab50af437787be41eaef678b9083ad0845878629
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-05-20 09:48:46 +02:00
Orgad Shaneh
b46064ea15 Bazaar: Avoid repetitive calls 
Change-Id: Ia66c949e6ba4931c2107c25967db1348d884afc4
Reviewed-by: Hugues Delorme <delorme.hugues@fougsys.fr>
 2014-05-20 08:51:06 +02:00
Orgad Shaneh
4e43e2edb4 Ios: Remove redundant null validation 
Change-Id: I1058e83fd4c16a162d79ef794382071da77a902c
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
 2014-05-20 08:50:49 +02:00
Orgad Shaneh
b3843939cb Ios: Remove unused loop 
Change-Id: Ic78064fa0bef5b4ad14b3ae2033da94457bad571
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
 2014-05-20 08:50:10 +02:00
Nikita Baryshnikov
f759ea2315 Fix rest of Puppettype -> PuppetType 
Change-Id: Ibebee3e841a0ad723301656d7334dbe45759da96
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2014-05-20 08:11:48 +02:00
Orgad Shaneh
c58cb2a4f0 Core: Pass const string by reference 
Change-Id: Ic927334a04cf61bccede3179eee0ca679c5b998f
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2014-05-20 08:02:12 +02:00
Orgad Shaneh
1c47b15d18 ProjectExplorer: Pass some values by reference 
Change-Id: I628c317fc86f1f4b33ca453018d54fb86babc1e8
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2014-05-20 07:52:17 +02:00
Orgad Shaneh
b9fedaa42b Utils: Add missing cast to qreal 
Change-Id: I6bbcb2b87b049a67255a66c951464e4eacfb2eeb
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2014-05-20 07:47:50 +02:00
Orgad Shaneh
a54353f397 ResourceEditor: Pass const string by reference 
Change-Id: I54f998ad99a509077386649309469a8dc922349f
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2014-05-20 07:45:07 +02:00
Orgad Shaneh
2df6d1c428 Macros: Avoid repetitive calls 
Change-Id: If0c0694fe4bc01066b31b430d087de1b64ed8e0a
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2014-05-20 07:45:02 +02:00
Orgad Shaneh
3251d0dcb6 Help: Fix condition 
Change-Id: I5e1f92c846166d979f24cda915050f86eb7b659a
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2014-05-20 07:44:51 +02:00
Orgad Shaneh
b76ea82290 Help: Pass const list by reference 
Change-Id: I00ece6d5c41a9067bd12b388bf9ca5f80e981ed6
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2014-05-20 07:42:55 +02:00
Orgad Shaneh
18de4e0af5 Core: Avoid repetitive calls 
Change-Id: I7402a3b437038820c27828f0308f37d20754f13b
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2014-05-20 07:42:15 +02:00