Commit Graph

52993 Commits

Author SHA1 Message Date
hjk
2564e8d782 Debugger: Move core file unpacking into RunWorker of its own
Change-Id: I99b7e6fc8eb9054a4135f693581575c3b8b541df
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-10-05 12:21:30 +00:00
Tobias Hunger
b41cf10d71 Utils: Make Benchmarker log to a configurable loggingcategory
Change-Id: I2bb6b42af775827dae1c1cc41f9dabf63edf58e7
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-10-05 12:15:56 +00:00
Ulf Hermann
7842a309ce ProjectExplorer: Add missing import
Change-Id: Ida0e9387036d5ab3a5abe8661c55e34ecef32187
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-10-05 09:58:15 +00:00
Orgad Shaneh
f56b2bfe6d CamelHump: Fix case insensitive matching after the same case
For example: window -> MAINWINDOW.

This was broken by the constraint that the first char must follow a non-
matching case in 2fb54abd03. It was fixed for pure lowercase in f792475739,
but this fix was evidentially partial.

Change-Id: I0c29b54768c40d0501f006182f2bd1ae1e94f3bf
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2017-10-05 09:26:52 +00:00
Andre Hartmann
0fb6a1479f CamelHump: Extend tests
The else part within "if (!c.isLetter())"
(camelhumpmatcher.cpp:79) was not covered
by the tests at all, so far.

Change-Id: I35eb5908110e4692cda41b58f419867da00b6501
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-10-05 09:25:59 +00:00
Andre Hartmann
7d35e08afe CamelHump: Leave the gauls alone (fix typo)
Change-Id: Idf2080fc4ba2ae64c7bc0d1ce7dc9c81c0c8585e
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-10-05 09:25:28 +00:00
Alexander Volkov
b884f6fdbc qmake: Add test functions for comparing version numbers
qmake really lacks version comparing functions:
users either use ugly constructions to compare versions
by components, such as
greaterThan(QT_CLANG_MAJOR_VERSION, 3)|greaterThan(QT_CLANG_MINOR_VERSION, 4):
or even incorrectly compare versions as strings:
!lessThan(apple_clang_ver, "5.1")|!lessThan(reg_clang_ver, "3.4"):

Add test functions versionAtLeast and versionAtMost which use
QVersionNumber to compare version numbers by components.

Task-number: QTBUG-62984
Change-Id: I65e6b3c296d0301d544b7e38bf3d44f8d555c7fc
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
(cherry picked from qtbase/8a3e8856e5606ec616d4420ff8c4f77969432390)
2017-10-05 09:15:55 +00:00
hjk
82e0eefc8d Debugger: Move static type related code to CdbEngine constructor
Change-Id: I5d5489030eab9c16385df9af15f5974eaa2190e0
Reviewed-by: hjk <hjk@qt.io>
2017-10-05 09:02:32 +00:00
Ulf Hermann
fb370f460d Move URL utilities from ProjectExplorer to Utils
This way we can access them from the qmldebug library.

Change-Id: I90ba80228f44a9d5ea825ad59f4bd1572969980e
Reviewed-by: hjk <hjk@qt.io>
2017-10-05 08:54:39 +00:00
hjk
d0e419e02b Debugger: Move some CdbEngine member initialization
More concise.

Change-Id: I28ac441cacfceef1ad5622f15fecac1d2cca9395
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-10-05 08:20:41 +00:00
Tobias Hunger
033b641373 Session: Make sure startupProject is set whenever a project is open
Never let the startupProject become nullptr while projects are still loaded.

Change-Id: Ie442c3a9b6cc4a65564002edc45b60a7993d2a52
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-10-05 08:15:03 +00:00
Tobias Hunger
56086d6bb5 MiniProjectTargetSelector: Allow for startupProject to be nullptr
This should not happen, but currently it does during session loading.

Change-Id: Ic4da775010c8d947e8db210f618519080068e14a
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-10-05 08:14:57 +00:00
hjk
9089b3acbd Debugger: Only set cppEngine if there's any C++ debugging
Fixes a regression introduced yesterday with 58a69c461a.

Change-Id: I9eea3d0adf45e2b65b7d395280ae0e0fbbe01127
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-10-05 08:11:20 +00:00
hjk
55d9fac2fb Debugger: Clean up outdated includes and files
Change-Id: I1b4b84ff9bfa3f6e0fe3030d70a114e2cf0f0604
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-10-05 08:06:43 +00:00
Robert Loehning
444e4f7ee6 Debugger: Initialize CdbEngine::m_autoBreakPointCorrection
Change-Id: I5baf137116e71d39c23dcc7bc12e87b363f30d98
Reviewed-by: hjk <hjk@qt.io>
2017-10-04 18:52:25 +00:00
Ulf Hermann
2f9d82791e QmlDebug: Move QmlDebugConnection into own file
Change-Id: I761658de7c19754cfaadf8cbbad7596a9bcdfbf3
Reviewed-by: hjk <hjk@qt.io>
2017-10-04 16:17:48 +00:00
Tim Jenssen
451f4a1e73 ProjectExplorer: fix testFlavorForOs()
Change-Id: I7e6e784c233159beead616149b7aeeb0f95225fe
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-10-04 16:15:27 +00:00
Knud Dollereder
5e3f52ef3b QMLDesigner: Fix Font size in form preview
If QT_SCREEN_SCALE_FACTORS is set we cannot set
QT_AUTO_SCREEN_SCALE_FACTOR.
Otherwise, we mess up the font sizes.

Change-Id: I7d1a07f4c671fdcae5a81556ab9e29df7ddf92d5
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-10-04 14:19:14 +00:00
hjk
58a69c461a Debugger: Remove DebuggerRunParameter::masterEngineType
It is a fixed value in the respective contexts, no need to track
this 'state' separately.

Change-Id: Id442202ff7a72baf5a2b19ba4bb9dfec5f47fb70
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-10-04 14:06:52 +00:00
Orgad Shaneh
674b4296db Debugger: Always set executable from user arguments
It is required also for coredump, attch to remote etc.

Change-Id: I99bdcf860fc7c4ffd7918213a121b56977bec19d
Reviewed-by: hjk <hjk@qt.io>
2017-10-04 14:04:07 +00:00
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