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

35759 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Orgad Shaneh
66d561a628 Utils: Pass const values by reference 
Change-Id: Iafd0f372f02f0f3759419a632e81325484861ba1
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2014-05-20 07:35:31 +02:00
Tim Jenssen
ce55d23e2a QmlDesigner: remove use of unexisting CreatorStyle 
Change-Id: Ie159ac705d62d9f8af007d0166bed18022cc2818
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2014-05-19 19:44:18 +02:00
Orgad Shaneh
bc6c5b9968 Core: Pass const values by reference 
Change-Id: I44f16528f2ee8fb41351153bab8dc340f4f2cca1
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-05-19 19:18:57 +02:00
Orgad Shaneh
a77e75c36e QmlJS: Fix wrong conditions 
Change-Id: I31740bca2b17e635c28af70779334f2b52ddb709
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
 2014-05-19 19:17:39 +02:00
Orgad Shaneh
10e011c1e9 QmlEditorWidgets: Avoid repetitive calls 
Change-Id: If574ad37fa25ced45a86ee0721da0e97c2845dc6
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2014-05-19 19:17:31 +02:00
Orgad Shaneh
6c0a018ac8 QmlEditorWidgets: Pass QVariant as const reference 
Change-Id: Ib59cb25ffed6acc4f1ad6dd450b68dc30372b168
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2014-05-19 19:17:23 +02:00
Thomas Hartmann
147ed4bae8 PropertyEditor.QmlDesigner: Fix the color LineEdit 
Using hasToConvertColor to handle the alpha channel.

Change-Id: I6b6e2ef4361efb7aba3adaf549cbddd625145e33
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2014-05-19 18:58:29 +02:00
Marco Bubke
32bc73d684 QmlDesigner: Fix spelling 
Change-Id: I3afc07ff07e65e4a0e6fd0f5374722fdc2e5d770
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2014-05-19 18:38:52 +02:00
Orgad Shaneh
824cd8be5e GLSL: Fix duplicate condition 
Change-Id: Ibb48b79e1c9bd3488a4c02776b6b180ba8525bc6
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-05-19 18:09:22 +02:00
Orgad Shaneh
4ad6cc494e Core: Fix indentation 
Change-Id: I9e65f8276b57e622c361148c0444354e2f34d55c
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-05-19 17:50:22 +02:00
Orgad Shaneh
c3e1f04476 FakeVim: Fix conditions 
Change-Id: I1787bd80124ebe224932e10be9e1e307c4925949
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-05-19 17:49:17 +02:00
Orgad Shaneh
c5bf80d026 QmlEditorWidgets: Add missing braces 
Change-Id: I4e12c05abb7b50593807e6306318c983d5e58432
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2014-05-19 17:48:05 +02:00
Orgad Shaneh
4a71b6c035 QmlEditorWidgets: Fix wrong condition 
Change-Id: Ib45a5470b0222afd61526ab1318dc02587aeb66d
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2014-05-19 17:46:28 +02:00
Nikita Baryshnikov
40bfca381c Fix master build. Hope that QDebug isnt need 
Change-Id: I9d274fe9af5642b09b98421df440874e41daf7c1
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2014-05-19 17:46:12 +02:00
Nikita Baryshnikov
914d4883d6 Fix braces 
Change-Id: I4753ab8f551a0131dc75390e31fe8fbfdd149dce
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2014-05-19 17:45:50 +02:00
Joerg Bornemann
9692c91d0f Qbs: fix QBS_APPS_DESTDIR with spaces 
Change-Id: I23f2a51aef58143dd530a50c7df43bfb7bb573a8
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
 2014-05-19 17:18:21 +02:00
Thomas Hartmann
f078f81784 QmlDesigner.PropertyEditor: Remove string helper function 
We use C++ helper functions instead.

Change-Id: I03ef168f4e47a6e2437676d906072e5f5ce7377c
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2014-05-19 16:53:22 +02:00
Alessandro Portale
d6b12213a7 ProjectExplorer: Use constants for compile_warning.png and _error 
Instead of repeating strings like
   ":/projectexplorer/images/compile_warning.png" all over the code,
we should use constants for it.

Change-Id: I91b36838d6da0a2332381e433788e796948d26db
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-05-19 16:51:59 +02:00
Thomas Hartmann
75c14dab3e QmlDesigner.PropertyEditor: Adding and fixing color conversion 
Adding proper color conversion as C++ helper functions that can
handle the alpha channel.

Change-Id: If48cd11ff71efb472d331ed6fd79464e1c5d572d
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2014-05-19 16:35:17 +02:00
Thomas Hartmann
29f660eede QmlDesigner.PropertyEditor: Removing redundant emit 
We should not emit the same signal twice.

Change-Id: Iee03d0b34e91f8f32d054582fcdee18d07be89b0
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2014-05-19 16:33:24 +02:00
Thomas Hartmann
de67cb25e0 QmlDesigner.PropertyEditor: Fixing color conversion in LineEdit 
For color properties we have to take care of the alpha channel
manually.

Change-Id: I2cbb5a2c45a16385068e771e1a1ca8a10f47a7bf
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2014-05-19 16:33:11 +02:00
Erik Verbruggen
44060c150e Remove unused field and its initialization. 
Change-Id: Id44197a4556fba2e5fc4ec6b9a4cdd659389ad69
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2014-05-19 12:02:04 +02:00
Joerg Bornemann
3d38541b14 disable Ctrl-C stub in debug build 
Activating the controlcstub in a debug build will send Ctrl-C to
Qt Creator too, because he stub and Qt Creator share the same
Windows.
We're disabling the stub in debug builds. Cancelling a build
still works but takes a bit longer.

Task-number: QTCREATORBUG-11995
Change-Id: I766c2eac1f07205c411a7e4164e7d73b6c0441aa
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
 2014-05-19 11:33:03 +02:00
Orgad Shaneh
a64a49ffcb TextEditor: Add Uppercase/Lowercase Selection to Edit -> Advanced menu 
Change-Id: I0019e53bb23ab20792216cbe6d60a8934559040e
Reviewed-by: David Schulz <david.schulz@digia.com>
 2014-05-19 08:37:07 +02:00