Commit Graph

54723 Commits

Author SHA1 Message Date
Christian Kandeler
1f73fb1402 qbs build: Update minimum qbs version
Change-Id: I1af5c32f4e19f67013a53fc3da7c1bcafbd4864b
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2017-10-04 13:40:24 +00:00
Orgad Shaneh
5e8e619dd0 Merge remote-tracking branch 'origin/4.4' into 4.5
Change-Id: I9b7cb3d845628abf69a73a279f5a79202c0976c2
2017-10-04 16:11:17 +03:00
Tobias Hunger
2966b7349f Qbs: Fix reparsing triggered by RunConfiguration changes
Task-number: QTCREATORBUG-18999
Change-Id: Ib44735d378029a30163ff2a5833d893bc0eb88c6
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2017-10-04 12:36:36 +00:00
Christian Stenger
3eb8c88974 AutoTest: Improve process error handling
If the test executable cannot be started or it seems
not to be the correct one or wrong arguments have been
passed to it the user now gets a respective message
inside the results pane.

Task-number: QTCREATORBUG-18955
Change-Id: Ica68cdbb9e401c8d48a9ce8b23b65d5410d2075a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
2017-10-04 12:29:01 +00:00
Eike Ziller
1a19afc3e2 DocumentModel: Add safeguard
It should never happen, but in the worst case do not
crash anyhow.

Task-number: QTCREATORBUG-19011
Change-Id: I9cd6f26929bf090262845b72d59a0654ad4eefff
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-10-04 12:26:41 +00:00
Tobias Hunger
62b3f422c4 MiniProjectTargetSelector: Fix removal of BuildConfigurations
Task-number: QTCREATORBUG-19008
Change-Id: I8effc8739cb9cc7a347836fde8ae7a94a402ddb7
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-10-04 12:26:03 +00:00
Christian Stenger
cff8dac2b8 AutoTest: Improve handling of canceled test configurations
If a test configuration cannot be guessed correctly and the
user cancels the dialog to select the correct runnable we still
have no valid executable.
Deselect the respective configuration for the current test run
and avoid warnings regarding empty executable.

Change-Id: I843bf2844a5530be047c142805992a5fb79cbc19
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
2017-10-04 11:45:36 +00:00
Ulf Hermann
7749a47e62 QtSupport: Move populateFileFinder to BaseQtVersion
This populates a file finder so that it is best able to find QML files,
prioritizing the given project/target. Some of it would also apply to a
non QML file finder, but as we don't use FileInProjectFinder for other
file types we keep the code here, for now.

Change-Id: I14e2ac63e699afe27d2f3af8ca3d57dfe732da8c
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-10-04 10:49:40 +00:00
Ulf Hermann
0693db3579 SessionManager: set startup project on addProject
If there is no startup project when we add a new project the new project
should become the startup project, as a situation where there are
projects, but no startup project is invalid. removeProject also checks
for the startupProject and adjusts it if necessary.

Change-Id: I5f12add832db82af553fc1e393e32185eb322866
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-10-04 10:49:29 +00:00
Tobias Hunger
7c94750d70 CMake: Modernize CMakeBuildConfiguration
Change-Id: Ie09ae7b765d6c2f72eb62b9db2937fbd68e232f5
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-10-04 09:53:03 +00:00
Tobias Hunger
2dabdbd2fe CMake: Report cache configuration arguments in server-mode
Change-Id: I3cd7a9ac37a1b8c3c6018070c6fdc506abedd736
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-10-04 09:52:43 +00:00
Tobias Hunger
7ae35898b5 ProjectExplorer: Make Run button state more robust
Do not connect/disconnect all the time, just subscribe to the signals.

Change-Id: I57023e9c0c758f5b09f6ef592fc2dd2a679f7c94
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-10-04 09:51:40 +00:00
Tobias Hunger
f8ded0df26 SessionManager: Modernize code a bit
Change-Id: I9e44990c62ccca8e06919576bb9be463bb84cf19
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-10-04 09:50:00 +00:00
Tobias Hunger
db5a00231f Session: Fix removal of projects
When removing a project setStartupProject(nullptr) may fail, since
it will reject any attempt to set the startupProject to nullptr while
any project is still available.

So delay this till nullptr is an option:-)

Change-Id: I6f41a17d922cf6333b7b7e17f8300e831e4807d9
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-10-04 09:49:52 +00:00
Tobias Hunger
c330cf0679 Replace manual signal blocking/unblocking with QSignalBlocker
Change-Id: Ibb59fab4e37d045e506c5a8172b6f5cbb955b028
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-10-04 09:35:06 +00:00
hjk
9f3e104e37 Debugger: Simplify QmlEngine construction
Change-Id: Id237998cf2d9a03f9c2929043fdb45ac49d4addb
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-10-04 08:54:10 +00:00
Christian Kandeler
a6d12177ad qbs build: Use require() instead of loadExtension()
This fixes a number of deprecation warnings. The require() function was
introduced in qbs 1.8 and is safe to use now.

Change-Id: I915a9f62f36fc64086c7dce60ea753d3e564127c
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2017-10-04 08:18:15 +00:00
Orgad Shaneh
84b57027c8 Git: Fix progress during rebase
Broke by c4b5048836.

Change-Id: I35b22b6ab5fd8767ef729906b8344a0d6aa1f0cf
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-10-04 07:51:12 +00:00
Orgad Shaneh
e20aa431ed ShellCommand: Apply progress parser also to stderr
It is only used for Rebasing message in Git, which was moved from
stdout to stderr on Git 2.12.

Change-Id: I761cb7ac4e0d19fc28b323076dd3b0919535ed32
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-10-04 07:50:34 +00:00
Orgad Shaneh
d8fda051f9 CamelHump: Minor cleanup
* Use local variables to avoid duplication
* Correct the regular expression:
  instead of (?<=...)(C|(?<=...)c) create
  (?<=...)(C)|(?<=...)(c)

Change-Id: Ibf65ab118017fa67db1cb0efa4eb82a4e36f284c
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2017-10-03 05:50:13 +00:00
Serhii Moroz
6afdb8bdf9 TextEditor: Disable block selection if file was changed in other editor
Task-number: QTCREATORBUG-18770
Change-Id: Iccdc3deb354599bf1fd6f1cb8c0d5a1765ecb471
Reviewed-by: David Schulz <david.schulz@qt.io>
v4.4.1
2017-10-02 08:30:11 +00:00
Christian Kandeler
7d88284e48 Update qbs submodule
To HEAD of 1.9 branch.

Change-Id: I90a37855cd405423ef02dc27be563b822ad96bd3
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2017-10-02 08:04:42 +00:00
hjk
5baecec6b7 Qnx: Fix C++ debugging
Task-number: QTCREATORBUG-17901
Change-Id: Iab7dfa3eb9a211770e45405f344d75ff20e8acae
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2017-09-29 14:26:36 +00:00
hjk
af63f488c2 Debugger: Simplify CdbEngine construction
Moving the knowledge that this won't work well outside windows
kind of decreases encapsulation, but that's not really worth the
complication of the error handling here.

Change-Id: Idcb6f6d64f33ee8c49a01e62e20aad16d3f01b86
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-09-29 14:12:54 +00:00
Robert Loehning
6d919cd85a Squish: Stabilize tst_simple_analyze
Change-Id: I3875451ee263a97f0919f08c96318502b49922f4
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-09-29 13:25:58 +00:00
Eike Ziller
b721b2dce9 Fix updating root directories in file system navigation pane
We also need to update the static cache of the root directories and
their properties, otherwise it will be wrong for file system panes that
are opened afterwards.

Change-Id: Iaf96f2728132e7c2f349095b347b13f833ccc732
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: Florian Apolloner <florian@apolloner.eu>
2017-09-29 11:02:52 +00:00
Tobias Hunger
ab3a76281c ClangStaticAnalyzer: Remove unused lambda capture
Fixes a warning in clang 5.0

Change-Id: I5e0415e65c3019e9deb3e99c396e6a86c6952ca4
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2017-09-29 10:57:25 +00:00
Tobias Hunger
2b7c5deadc GccToolChain: Improve findLocalCompiler
Improve findLocalCompiler to better match the semantics of icecc/distcc.

Task-number: QTCREATORBUG-18902
Change-Id: I06e7957d37bff449ce0188dd5d19e88d25f8e459
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-09-29 10:56:20 +00:00
Eike Ziller
5e622a3203 Use nullptr and member initialization in document manager
Change-Id: Iddd446d10cf3fd0a59d46d6ed3ba335f0c93e118
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-09-29 10:46:28 +00:00
Ulf Hermann
7c3ea5a78c ProjectExplorer: Make some more menu group IDs public
This way other plugins can add entries to those menus.

Change-Id: I3c536a85543d267983a6797f62e25be9e4b7e006
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-09-29 10:19:17 +00:00
Tobias Hunger
cac9db78df CMake: Make conditions in disabledReason and updateEnabledState match
Change-Id: I7c218b20e15c1e7b2dcca7dd80b226536cfa650b
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-09-29 10:17:03 +00:00
hjk
e3f0e1be08 Qnx: Use simpler portsgatherer command
As indicated by the removed comment, the original version was
way too complicated.

Change-Id: Ie5d8d8fbe7bd8e44e0538117cd2aaa73958f7d8c
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2017-09-29 10:10:08 +00:00
Eike Ziller
af8cd2b633 More changelog
Change-Id: Ic0064a21bf080ddc4803bcbbe92d0dab29d765d9
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-09-29 09:40:25 +00:00
Tim Jenssen
7dbd399a97 Wizards: introduce ObjectToFieldWidgetConverter
With it as a wrapper we can register any QObject
to use widget based field mechanism from QWizard.

It also helps to avoid the necessity for inheritance
to just adjust the text property of a widget.

Can not remove the TextCheckBox, because it is used
in some old C++ wizards.

Change-Id: I85a85a834714a4b38b501c13357fa8c8bb02b5bd
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-09-29 09:34:08 +00:00
hjk
64d784ec9a Qnx: Fix Qml profiler startup
This essentially replicates the RemoteLinux setup with
the additional Slog2Info runner.

Verified to work with Qt 5.9.2 on a BD-SL i.MX6Q_Sabre-Lite_Board
armle running QNX  6.6.0 2014/02/22-19:07:53EST

Task-number: QTCREATORBUG-18954
Change-Id: Iffea289b7c7f25d23472c9e12b5e45c460c93795
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2017-09-29 09:23:32 +00:00
Ivan Donchevskii
bea6a3dc9f Clang: Fix ClangCodeModelServerSlowTest.RequestDocumentAnnotations
Add missing HighlightingMark parameter in test.

Change-Id: I7b2661152bebf038a3da650ee20b253fa18b471f
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2017-09-29 09:08:04 +00:00
Laurent Montel
41c9ef6ec0 Subversion: fix forward declaration
Change-Id: I4fa01e0fb5b2a56959a30737b6aea0acc4889334
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-09-29 08:34:12 +00:00
Ulf Hermann
defcb6a55a QtSupport: Add a method to retrieve the QML path
We check that qmake property in many different places.

Change-Id: Ifd5efe4ad2831385493bd3afe8538929578e8fb4
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-09-29 08:26:33 +00:00
Tim Jenssen
bb16ae7323 Wizards: let the page use wizard values
For example it will be used to get the
wizard directory to show icons in fields later.

Change-Id: I6a243a67a89e4a0133550a61b870d771147667f1
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-09-29 07:59:24 +00:00
Eike Ziller
2364efc133 Add changes file for 4.4.1
Change-Id: Icca756e45af941b0d6fe320ebc06183e27c01f02
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-09-29 07:29:27 +00:00
Andre Hartmann
8730dbd4e6 Locator: De-duplicate RegExp pattern generation
Change-Id: I3576e1507aebed15245e1f197995bfe9e345e32b
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-09-29 07:03:43 +00:00
Eike Ziller
e0639d0696 Fix reload issues for files with multiple registered documents
If a file is removed, the file system watcher can loose its watch
on it (e.g. on Linux, inode-based).
Saving files does so "safely" by writing a temporary file, moving
the original, and moving the new file in its place, which is
triggering the issue above. That is why we need to re-register
the path in the file system watcher.

This broke in the refactoring done
by 05485071b0

Task-number: QTCREATORBUG-18892
Change-Id: I3b216d614b9f82e308da63c07d990e5911193655
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-09-29 06:48:49 +00:00
Ryuji Kakemizu
fc4bc59fd5 Fix deployment to Windows 10 Phone Emulator
Change-Id: Iaedee9ee61c3bf6b628a2f3d6480b980ddac54f2
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2017-09-28 16:47:02 +00:00
hjk
b58f695cf8 ProjectExplorer: Sort dependency names alphabetically
Task-number: QTCREATORBUG-18843
Change-Id: Iba25e9ea292b34a7479e0456d005d02b678477f5
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-09-28 14:58:20 +00:00
Laurent Montel
fd2cca08c0 qmljseditor: fix forward declaration
Change-Id: If44cf14eb04c74a164d6b3cd68cd5a114fff1533
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-09-28 14:57:06 +00:00
Nikolai Kosjar
087ea0e531 Clang: Rename directory ipcsource to source
Now it's in accordance with clangrefactoringbackend/source and
clangpchmanagerbackend/source.

Change-Id: I939cfc72cffb8fcde0649f125e6efb6670d1cbc3
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-09-28 12:45:41 +00:00
Nikolai Kosjar
917592970d Clang: Extract and rename backend classes
IpcCommunicator -> BackendCommunicator
IpcSender -> BackendSender
IpcReceiver -> BackendReceiver

Change-Id: I110ebe8d185db7ff47d2d5de9b786262520926d0
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-09-28 12:45:31 +00:00
Vikas Pachdha
66a42a7ffb Android: Fix the SDK platforms parsing for SDK tools 26.1.1
Task-number: QTCREATORBUG-18962
Change-Id: I780193be482ebc151931196792068d7c4d1ad808
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
2017-09-28 12:34:59 +00:00
Orgad Shaneh
9d40f81441 Merge remote-tracking branch 'origin/4.5'
Change-Id: I919f3dac0bf44f18276e4f70309414bb22c74973
2017-09-28 13:59:51 +03:00
Nikolai Kosjar
315031e3f5 GLSL: Avoid infinite loop at error recovery
For error recovery additional tokens are tried to produce a valid
grammar rule.

For the specific case in the bug report

    for(int x=0; x y

the two consecutive identifiers in the end triggered an infinite loop
since the identifier token is also part of those additional tokens that
are tried.

Circumvent this by trying a more conservative list of tokens on the
second try.

Done-by: Erik Verbruggen
Change-Id: I271dddecf947a06ed3af5f9955ee630441533342
Task-number: QTCREATORBUG-18967
Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2017-09-28 10:40:32 +00:00