Commit Graph

54723 Commits

Author SHA1 Message Date
Christian Stenger
9618e6b19e Utils: Fix compile for Qt5.6
Change-Id: I5785aad7bea80229bcac35e3b1aa9aa69d9f90e5
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-08-01 10:54:24 +00:00
Tobias Hunger
bbb54cdeba MiniProjectTargetSelector: Use generic reporting of project configuration changes
Change-Id: I55a852db08ee5700acb7530769166b19fb12a670
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-01 10:21:25 +00:00
Tobias Hunger
5021a882e7 ProjectExplorer: Simplify *ConfigurationModels
Do not duplicate the code three times!

Change-Id: Ia2d7656242ae8270f51cd787f1261ff1aa135967
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-01 10:21:10 +00:00
Orgad Shaneh
2e15bfdc18 PersistentSettings: Minor cleanup
* Use member initialization
* Remove break after return

Change-Id: If3f97fde05717ec3e2134489f24f6b64a75b4a1e
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-08-01 10:17:18 +00:00
Christian Stenger
b7c8818eb9 Squish: Update expected texts
Change-Id: I0959635cdfe92335c0a5582119e145c8e7ea88b2
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2017-08-01 09:33:54 +00:00
Robert Loehning
d93f17466a Squish: Update expected completions
Change-Id: I0df3f777cb04e0609be01f5f0acf8b909f64ebd3
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-08-01 09:06:54 +00:00
Orgad Shaneh
c35f09db04 Debugger: Replace accelerator for Registers from R to I
Alt+R is used by default for "Play Last Macro", we use it for "Run Without
Deployment". Having it as an accelerator means that this shortcut can't be
used in Debug mode.

Change-Id: Ied1288e9bfe7d41dd6f82249f3cece79dac37df1
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-08-01 08:52:27 +00:00
Nikolai Kosjar
8bf50e719a Clang: Adapt failing ClangCodeCompletionTest::testCompleteGlobals
This should have been adapt in

    commit 33a2288c7d
    Clang: Fix extra space before left paren

Change-Id: I68fe7cbbdcb9432a7dce6aede00a3190cce1cd4d
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-08-01 06:50:35 +00:00
Andre Hartmann
e75f595873 SearchResultWidget: Disable replace button if replace text is unchanged
To avoid unneeded file rename operations when the "Rename x files"
checkbox is checked.

Change-Id: I3fc8b1607979bdfcdd7a3f2d3cf172350f7ca758
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2017-08-01 06:26:35 +00:00
Tobias Hunger
f1d735b7dd Target/Project: Add generic signals for changes in the project configuration tree
Change-Id: Iae0589620a8caf8e3748589b12329608ef3a39da
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-07-31 18:13:35 +00:00
Tobias Hunger
d7aa095670 ProjectExplorer: WS only fix
Change-Id: I201ce909a0159e84f27fbdaa46cabf5f3f2d2bde
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-07-31 18:12:14 +00:00
Nikolai Kosjar
941af98716 QbsProjectManager: Make version and profile selectable/copyable
...in the qbs settings dialog.

Change-Id: I5c0de7b10fe156d3c29fc17a9ed3963f61a06f7d
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2017-07-31 15:04:26 +00:00
Robert Loehning
11abd8edf7 Squish: Replace Qt4 SDK by self-built Qt 4.8.7
Change-Id: If990367afb01aae94755930c02c81ae82b23bb8f
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-07-31 14:04:00 +00:00
Leena Miettinen
4af7792ad3 Doc: Describe Android run settings
Users can apply Android Activity manager (am) start options
and run shell commands before and after starting applications
on Android devices.

Change-Id: I9ffcfce8a26b8e7d965a1a2327eeedf38bf81a31
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
2017-07-31 13:30:56 +00:00
Tim Jenssen
afbfcf8d70 ProjectConfiguration: Add project() member
Change-Id: I0a7170c1721a9e5bcf18af1bab8158af71c64454
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-07-31 13:20:48 +00:00
Tim Jenssen
e8c57c98d6 ProjectTree: keep lastFocusedProjectTreeWidget to get currentNode
Also remove currentNode checks from updateFromDocumentManager()
We already checked for focus in the update() method.

Change-Id: Id1bc28ce442b5b56597a675516ceea4fbc1801de
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-07-31 12:31:16 +00:00
Tim Jenssen
73c7cb19cf ProjectTree: remove indirections and rename methods
Change-Id: Ia529bd7c199af2943f6c3da7d25352619da5a7f8
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-07-31 12:14:44 +00:00
Tim Jenssen
77aa5b180d ProjectTree: remove not used invalidCurrentNode argument
Change-Id: I31f5c5e8218620b469e568d22a9fa00c49f151ad
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-07-31 12:14:34 +00:00
Marco Bubke
ebd675013f Clang: Fix highlightingmark test
Change-Id: I2c25e06e29e9024e8d3c38536e0e1f93ef65b7e8
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-07-31 12:04:05 +00:00
Vikas Pachdha
319a52cc3e Android: Fix SDK tool's version displayed in the error
Task-number: QTCREATORBUG-18655
Change-Id: Iaee5118a74b4e83903af50d03e72c8bd6fa4a8b4
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2017-07-31 11:45:51 +00:00
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
c650b547db Doc: Describe managing simulators
Users can now view a list of available simulators in iOS
preferences and add copies of them.

Add screenshots.

Change-Id: I24cbd9c4fda437528ff179c37246d909bbc8e11b
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
2017-07-31 07:06:37 +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
Eike Ziller
48d3fd1af5 Dev package: Collect from all directories except tests/ and share/
Except for the qmlpuppet directories under share/.
Some plugins have other directories to look into than plugins/.

Change-Id: I89cc61d02c39ecee2cfb6db72986003651ca4b9c
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-07-28 11:18:17 +00: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