feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
54,723 Commits 108 Branches 368 Tags
41df91ece8e2d88fabbaf00b2074b810ba93b51a
Commit Graph

44349 Commits

Author SHA1 Message Date
Leena Miettinen
5a3da74422 SCXML editor: Fix capitalization of UI text 
Change-Id: I2a67d63495f665d8a9e365bf420957b1def4d1e0
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
 2017-07-31 11:32:27 +00:00
Robert Loehning
583361af55 ProjectExplorer: Initialize member 
Change-Id: I3b8642e555272eedc72b42c489523697d578a924
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
 2017-07-31 11:20:46 +00:00
Christian Stenger
04db8e3a91 ProjectExplorer: Avoid possible nullptr access 
Change-Id: I1a1ce6a8eb958aaedbce215d4be9cbbde92699ce
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
 2017-07-31 09:57:44 +00:00
Orgad Shaneh
6334632f00 DiffEditor: Jump to original file on Enter 
Task-number: QTCREATORBUG-18650
Change-Id: Id6bfb9892aee2e4d7b7772b7dd208107ec4b3b11
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
 2017-07-31 08:43:05 +00:00
Leena Miettinen
661818a67e iOS: Add punctuation to end of messages 
Change-Id: I744843de0f728edcdaa10024b13454b5d673464a
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
 2017-07-31 07:05:01 +00:00
Christian Stenger
27cb331b4b AutoTest: Avoid guessing run configuration 
Base the selection of the run configuration on the executable
we have gotten already from the BuildTargetInfo and take
deployment information into account.

This also reverts cce1e130 partially and avoids
stuffing unrelated information into the buildsystemtarget.

Change-Id: I3de6e910a5fd1092d428ec4afc33c4ca62daaa25
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
 2017-07-31 06:11:35 +00:00
Alessandro Portale
b50d5a4b0b QtSupport: Add Qt 5.9 specific feature versions 
Change-Id: Ifc659654bd13f20107ae4a5ee1c112be9244d983
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
 2017-07-28 22:24:35 +00:00
Tobias Hunger
366ada9fea RunConfiguration: Centralize enabled state handling 
Centralize handling of enabled state of RunConfiguration widgets.

Remove code that does the same thing in all the different run configuration
widgets.

Change-Id: I175d7e19d031bd28a2b19cd825e0b6568da19bc3
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
 2017-07-28 17:26:10 +00:00
Tobias Hunger
131c7a1c4e ProjectExplorer: Introduce base class for enabled/disabled project configuration 
... and use this as a base for all RunConfigurations.

Clean out code in the individual run configurations dealing with their
enabled/disabled state.

Change-Id: Icc2ea136b056f7aea7ce96480b4402459d7ac0ce
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
 2017-07-28 17:26:03 +00:00
Eike Ziller
c01ddc4660 Merge remote-tracking branch 'origin/4.4' 
Conflicts:
	qbs/modules/qtc/qtc.qbs
	qtcreator.pri
	src/plugins/qbsprojectmanager/qbsproject.h

Change-Id: I6b9cdf704be95ade02488c8b19582b6621282fb8
 2017-07-28 15:24:14 +02:00
Jochen Becher
712297cbf0 ModelEditor: Fix coverity findings 
Change-Id: I40d58ce3e5040dc083bbcd27cc6481510ae41f95
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
 2017-07-28 13:14:16 +00:00
Leena Miettinen
3696852880 QtQuickDesigner: Use double quotes for emphasis in messages 
Change-Id: If53aff1563c1ea38e42007e4a391312d4ef5d261
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
 2017-07-28 11:20:25 +00:00
Eike Ziller
aed6a66be3 Merge remote-tracking branch 'origin/4.3' into 4.4 
Change-Id: I4876ce528e2422f63280535fe4f9dd6610a75dec
 2017-07-28 13:19:50 +02:00
Christian Kandeler
da06a6546d Add another fall-through annotation 
Change-Id: I2a44f7a12ea9f7f5bef2dd898b5f3575d8ecd190
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
 2017-07-28 11:00:12 +00:00
Christian Kandeler
11ba8f0538 Update qbs submodule 
To HEAD of 1.9 branch.

Change-Id: I71384c0eff96dcbd83f0e41c980799fbb184d871
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
 2017-07-28 10:56:27 +00:00
Christian Kandeler
02b825c65f qtcreatorcdbext: Fix qbs build for the "no python" case 
Change-Id: Ic62b1052ffa693c0a040de1a2efd2dc06b49ac7f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2017-07-28 09:52:33 +00:00
Leena Miettinen
42d19bf367 TextEditor: Add punctuation to end of message 
Change-Id: I3f8f85d8687e4b8fa14ed48e1cc02fce76b8c138
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2017-07-28 09:18:07 +00:00
Leena Miettinen
8b5dfab38e QtQuickDesigner: Add punctuation to the end of error messages 
Change-Id: I7a7ebf343860e887c10be044cbe6930ffe13dd59
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
 2017-07-28 09:17:54 +00:00
Orgad Shaneh
21fd430db8 QbsPM: De-static const strings in constants header 
Having a static variable in a header is strange.

Change-Id: I42c0244f6e73f1cbf530e704a36b96bf5b85a017
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
 2017-07-28 08:58:48 +00:00
Orgad Shaneh
abbea9a84e QbsBuildStep: Remove QLatin1* 
Change-Id: I46e47531cba5c650a8e40e957d7423ae60ffb989
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
 2017-07-28 08:57:51 +00:00
Leena Miettinen
15819b5027 SilverSearcher: Fix UI text to follow guidelines 
Change-Id: I6b0902e23b16a0e00087d65077776779498a9423
Reviewed-by: Przemyslaw Gorszkowski <pgorszkowski@gmail.com>
 2017-07-28 08:52:14 +00:00
Tobias Hunger
34de70c270 Qmake: Quieten soft assert about parsing already happening 
asyncUpdate is only ever called via scheduleAsyncUpdate, so only
notify about parsing start there.

Change-Id: I4311c6ac1add354de96cc25c0cccd0504409e0a8
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
 2017-07-28 08:47:16 +00:00
Tobias Hunger
f5beeb4c7e ProjectTree: Show parsing state of projects 
Show which projects are currently parsing in the project tree.

Change-Id: Ie69907a73ec7c3cf2ef40c37db620a0144178f95
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
 2017-07-28 08:33:50 +00:00
Leena Miettinen
435c8cf0f9 ProjectExplorer: Use double quotes for emphasis in UI text 
Change-Id: I2a051304de8f6aba3b37a0d572e96f35dd9d259b
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
 2017-07-28 08:32:20 +00:00
Leena Miettinen
6150d908d1 ClearCase: Fix UI text to follow guidelines 
Change-Id: Ida47885f58aa0a219ad9eef5aa670a643c58744e
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2017-07-28 08:31:59 +00:00
Leena Miettinen
11893271ba Extensionsystem: Add a full stop to the end of error message 
Change-Id: I8cf154434ed757861bf43de68ea9b6625cd6db4c
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2017-07-28 08:31:40 +00:00
Leena Miettinen
97a6dc2c36 ProjectExplorer: Add punctuation to ends of messages 
Change-Id: Idaa794204b87b5a139203a6d183935425ecfd67e
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
 2017-07-28 08:24:38 +00:00
Tim Jenssen
8f9e537dcf Icons: warn about invalid resources 
Also give a 1x1 pixmap back to avoid paint engine error messages.

Change-Id: Ibd7793d133952c4c3169796432b42572af0ace21
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
 2017-07-28 08:08:30 +00:00
Leena Miettinen
b29ea4527a Git: Do not use the (s) plural in UI text 
The UI text guidelines advice against this.

Change-Id: Ib8f9cb291f0217de10853412b133173f1d11e7b7
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
 2017-07-28 08:06:56 +00:00
Leena Miettinen
6c25c67b98 iOS: Write "error" and "simulator" in lower case in messages 
Change-Id: I20d2266b2f40dc19b367e7704b72977a84814c3c
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
 2017-07-28 08:06:35 +00:00
Leena Miettinen
d0093ad631 iOS: Add space before start bracket in UI text 
Change-Id: If1ac4ac557790b4919637c77222c4a49c4366170
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
 2017-07-28 08:00:27 +00:00
Vikas Pachdha
fc3469eb1e iOS: Fix invalid device asserts during automatic kit update 
Change-Id: I744022ca4441880995f9b965bf7092d6ec985886
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2017-07-28 06:46:17 +00:00
Eike Ziller
a7bc977056 Fix close icon for right side navigation panes 
If there is only one view, it should show the "close to the right" icon,
not "close to the left".

Change-Id: Ifb7c4261cb74e35310dc3d634720d9daa20df3f1
Reviewed-by: André Hartmann <aha_1980@gmx.de>
 2017-07-28 06:42:35 +00:00
Andre Hartmann
de7d6afb55 SearchResultWidget: Use member initialization 
Change-Id: I0dea28ceec2ed3261a1a5b25c7b4b2c8f58f7be8
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2017-07-27 19:53:11 +00:00
Andre Hartmann
3fe14e4452 SearchResultWidget: Remove excess newlines 
Change-Id: Ifbbc42069951c6cd41e33df4324ff6cbeabea79f
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2017-07-27 19:39:43 +00:00
Eike Ziller
9297ee92c6 Help: Fix destination of index locator filter 
When using locator in the external help window, open help pages or show
the topic chooser in the external help window, not the main window.

Change-Id: I792223147f1eb00addafb2618017536c126c71dd
Reviewed-by: David Schulz <david.schulz@qt.io>
 2017-07-27 12:15:11 +00:00
David Schulz
b1390a07ca Android: Simplify code assist by using KeywordsCompletionProvider 
Change-Id: I566e54e8cb539227019fd9cf94113924d1ac9822
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
 2017-07-27 11:42:15 +00:00
Orgad Shaneh
905b9298ed GCC: Detect also 16-bit width 
Change-Id: I6843f6c172954a0f89763a0993c69c9f4ea99a20
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
 2017-07-27 11:40:53 +00:00
Orgad Shaneh
f240abd214 Abi: Some more cleanup 
* Replace << with initializer lists
* Replace C-Style cast

Change-Id: Ie308e9975a755cccae0fa5ad2655a83a082b4ec7
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2017-07-27 11:40:32 +00:00
Christian Stenger
9205bc7aeb QbsPM: Implement configureAsExampleProject function 
This function is used in some of the plugin unit tests of
QC.

Change-Id: I8e5f5b734a78a207f139b676aa6616abcc9ce7c0
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
 2017-07-27 11:14:02 +00:00
Orgad Shaneh
3ae0b2eeaf GCC: Do not always append space to display name 
Change-Id: Ia766a4835e24f49152b4bc7fbab2d154b028510c
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
 2017-07-27 10:34:02 +00:00
Orgad Shaneh
a4e442ecb7 GCC: Test for actually used ABI attributes instead of isValid() 
Change-Id: I750d7fd369a941a5f8837bddb01714541742a46e
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
 2017-07-27 10:33:37 +00:00
Orgad Shaneh
b123018287 Git: Fix blame with selection that ends on the last line 
This also removes an additional line when the cursor is on a line start.

Change-Id: Iaec6f60b8e33d98c3a3ed0555ee4ff01991ad7fb
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
 2017-07-27 10:33:10 +00:00
Robert Loehning
3e214a2ebd TextEditor: Compile fix 
Change-Id: I0edf0fd32077a06102aec5951860c28723e46178
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2017-07-27 10:23:15 +00:00
Oliver Wolff
f4db435976 Fix compilation: take 2 
Change-Id: I1f1f2c8dee1afc768633af074af650bdfd200a2a
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2017-07-27 10:11:48 +00:00
Oliver Wolff
d492f5aa44 Fix compilation 
Change-Id: I2f7f92b028dcb60491d813b88bfe881c305c66ad
Reviewed-by: David Schulz <david.schulz@qt.io>
 2017-07-27 09:55:46 +00:00
David Schulz
26fa374084 Debugger: check for python when builing cdbext with qbs 
Change-Id: Ife169124f9fcd885774cd39698281e9a64e4545b
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
 2017-07-27 09:16:12 +00:00
Tobias Hunger
5d8b0e6352 Utils: Separate rendering out of ProgressIndicator 
I want to reuse the rendering of the progress indicator outside
of a widget.

Change-Id: Icaeeb798578ad838693b68556bf2193c4ba45cfa
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
 2017-07-27 09:15:05 +00:00
Marco Bubke
400da9def8 Sqlite: Remove static database handle 
Change-Id: Ic31f61a477ad681652eeccdaa39f82970c57eb5a
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
 2017-07-27 09:14:48 +00:00
Marco Bubke
e562cc3f68 Sqlite: Cleanup exceptions 
Change-Id: Id5ac7e6aba407eb5a3164bba57bff043e809beef
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
 2017-07-27 09:14:37 +00:00