Commit Graph

46833 Commits

Author SHA1 Message Date
Orgad Shaneh
3be096f152 Utils: Support default value substitution in macro expansion
Syntax is similar to bash substitution:

%{variable:-default}

Change-Id: I50e4e18a186c5408dc8b7b95cebbf891d13e03bf
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: hjk <hjk@qt.io>
2016-07-18 13:15:58 +00:00
hjk
eece696da3 Debugger: Remove multiple definitions of WatchWindow
Change-Id: If8241717f195ff31c9d6124285f77fca969056c4
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2016-07-18 13:07:35 +00:00
Ulf Hermann
f8957a85b3 QmlProfiler: Remove dependency on ssh
QmlProfiler does not depend on ssh.

Change-Id: I603b673a27fd4fa47246a71ae1f394d11f51a8b0
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2016-07-18 12:13:09 +00:00
Ulf Hermann
ba9825625d QmlDebug: Decouple log messages from connection failures
A socket error is not the only possible reason for a connection failure
and exposing socket error codes to the upper layers is unnecessary.

Change-Id: I27e9f21160ecea5b0d811b83b7ab0ab9071cacff
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2016-07-18 12:01:12 +00:00
Ulf Hermann
60bc2ccc95 QmlDebug: Add socketState and flush() for local sockets
Change-Id: Ieb90f661eaa2a595c88e1e36653437c810a6aa3a
Reviewed-by: hjk <hjk@qt.io>
2016-07-18 11:55:12 +00:00
hjk
2d79bdc29c Debugger: Remove some uses of semi-global currentEngine()
Make use of recent TreeModel improvements in various
tool views, push more operations into the engine-
owned data models, specifically context menu creation.

Change-Id: I479c97102b9fb81611c6461c6df1cec59295179a
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2016-07-18 11:17:53 +00:00
Tobias Hunger
84f1466b01 Use FileChangeBlocker
Use FileChangeBlocker over expecting/unexpecting file changes manually.

Change-Id: I8428841f966d81be477260416c75e91dee795425
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-07-18 09:07:23 +00:00
Orgad Shaneh
2ec82a2a93 Utils: Support pattern substitution in macro expansion
Syntax is similar to bash substitution:

%{variable/pattern/replacement} takes the expansion of variable, and
replaces the regular expression pattern with replacement once.

%{variable//pattern/replacement} replaces all occurrences.

Capture groups are supported for both forms.

Change-Id: I67ff91e2dad4dd8be81573ea446cd1093a05ccf6
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: hjk <hjk@qt.io>
2016-07-15 13:26:41 +00:00
Eike Ziller
7e1b4ccebb Merge remote-tracking branch 'origin/4.1'
Change-Id: I041b949aff8bee481a572ba6f7e2ef72b9010923
2016-07-15 14:10:38 +02:00
Alessandro Portale
cc18dc3cd8 Core: Remove text shadow from progress label
This removes the last occurrence of "Text with shadow". The progress
label was not only inconsistent but also bad on light themes.

Task-number: QTCREATORBUG-15999
Change-Id: I9c17402607d413fcfa0edcf342a50575d405dc1f
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-07-15 11:42:14 +00:00
Tobias Hunger
7f81c09097 Add variable substitution for different toolchain languages
Extend the existing "Compiler:*" substitutions with "Compiler:*:<LANGUAGE>"
which can be used to query all the information about different compilers
used for different languages.

The original "Compiler:*" is kept for compatibility reasons and points to
the Cxx compiler.

Change-Id: I356b8b3cb6b55a44581f2c78db90f8a197b0aff0
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-07-15 11:41:05 +00:00
hjk
26fa769bab Debugger: Add dumper for QMeta{Enum,Method,Property}
Task-number: QTCREATORBUG-16593
Change-Id: Iaa710660d8ef69459596f93831cf8467913f0468
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2016-07-15 10:44:03 +00:00
Christian Stenger
ac1c04b6b3 AutoTest: Fix document update handling while code model indexing
Avoid fetching all files for the startup project again and again
while code model is indexing files. The indexing emits documentUpdated
signals for all (relevant) processed files.
If code model is indexing we perform a full parse anyhow after the
indexing has finished.

Change-Id: Ibfdb47f403da19d5bab3eb2295447ad451fca2b5
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-07-15 10:27:59 +00:00
Christian Stenger
9a3a0fa7ce AutoTest: Fix detection of gtests inside namespaces
Task-number: QTCREATORBUG-16535
Change-Id: I3285d2545e2861607b6e1406ee24f950405c4367
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2016-07-15 10:17:44 +00:00
Ulf Hermann
b333b30c78 QmlDebug: Properly close connection on invalid messages
Change-Id: I5411a576bde22193bc997908ca2c87d9660d3ea8
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2016-07-15 09:22:53 +00:00
Ulf Hermann
1cc8cd7f02 QmlProfiler: Move connection failure message to QmlProfilerTool
and show it on any kind of connection failure, not only on timeout.

Change-Id: I6b9c44cd3455d5dd383a552f9b422d3d236b67c4
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2016-07-15 09:22:45 +00:00
Christian Stenger
38484d463c AutoTest: Correctly release resources
Change-Id: I8023c1468f9cf9cc0c549a466b298e19a6b40a15
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
2016-07-15 09:19:18 +00:00
Christian Stenger
0b527de52e AutoTest: Fix parsing for QuickTests
If the scan for quick tests was triggered just by a change of a
qml file (including indexing by the respective modelmanager) we
might find tests that won't be able to execute.
If we have already found quick tests we know their respective
project files. If we cannot find the files to be scanned inside the
already found ignore scan requests for such files.

This patch is kind of a continuation of b570ee1b80
(Fix initial parsing when loading session)

Change-Id: Ic1228641f60abf127134acbd4232a0ddd30ef159
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-07-15 09:19:12 +00:00
Christian Stenger
e51443ce62 AutoTest: Add handling for system messages
QTest uses special type for critical and for special internal messages.

Change-Id: I980b2ccd2913012be24183ea503247331eeb97e1
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2016-07-15 09:18:13 +00:00
Christian Stenger
48b2af5e77 AutoTest: Cancel possible running tasks on shutdown
If tasks are running while shutting down we might end up in a crash,
so cancel all tasks and handle possible invalid accesses of the
current running processing.

Change-Id: I69f7cac5f44390e322fa301af6d6794270c95c2a
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-07-15 09:18:01 +00:00
Christian Stenger
e70adf820e AutoTest: Allow run/debug without deployment
Task-number: QTCREATORBUG-16486
Change-Id: I7ef5887e065830152744a9bd7d7727058b4521d9
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2016-07-15 09:17:48 +00:00
Tobias Hunger
ebfdac357c ToolChain: Change languageId for C++
"C++" might end up clashing with Orgad's work to make variable substitution
more powerful. Use a pure-ASCII-string name (Cxx) instead.

No conversion code since the impact can't be big so far, considering how
new the code is.

Change-Id: Iab1c91cd89d6c11dfaad80472a312e619abb6d97
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-07-15 09:17:14 +00:00
hjk
5dcf23f62d Debugger: Disable QDateTime dumper for Qt >= 5.8
Chicken out for now after latest internal structure changes.

Change-Id: I66e283e52f9b51a51065520ecd3eb07b15e82fc2
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-07-15 09:07:20 +00:00
Jochen Becher
dfda517a1e Kits: Fix compilation error
Change-Id: I63089089bd59c5ce594ff6268075e3bb52caeb43
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-07-15 08:46:08 +00:00
Alessandro Portale
63eae6bd85 QmlDesigner: Theming of property editor checkbox and "tr" button
Change-Id: I599cd52c1b2b2e24952a9738f07eed0826802d4c
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-07-15 08:33:00 +00:00
Lorenz Haas
676b317dd0 Tweak solarized editor themes
Use solarized yellow and red for warnings and errors.

Change-Id: I5164b1184e397eaaca68e06db74b43f6e59edfdd
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-07-15 08:32:28 +00:00
Ulf Hermann
72890f69a1 QmlDebug: Signal an error if local socket cannot be opened
Change-Id: I61fa544f454e22de45d6a6ef9180a896231662c9
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2016-07-15 08:24:08 +00:00
Christian Stenger
6063c185cb Tests: Provide qbs file for newly added test
Change-Id: I0b6c41b8c8dbb3ef84bd106aa26357267f5de9a6
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2016-07-15 04:38:40 +00:00
Christian Stenger
7583557dcc Tests: Fix test when using shadow build
Change-Id: I82ebdbd63a221802f24b2ef17ca6c076151fba0c
Reviewed-by: Marco Benelli <marco.benelli@qt.io>
2016-07-15 04:38:33 +00:00
Thomas Hartmann
e43773014a Adding Solarized editor themes
These color schemes are based on the Solarized color schemes, originally
created by Ethan Schoonover:

http://ethanschoonover.com/solarized/

Change-Id: I75848608f59bbb32a78520e7b1a1a2554f2eca44
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-07-14 15:58:59 +00:00
Tobias Hunger
32b484e26e Introduce ToolChainKitInformation::targetAbi(Kit *)
Use that in the debugger. That simplifies the logic a bit.

Change-Id: Ia72607283373ee0f89a91f347db0ef2c87cf9fb3
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-07-14 15:46:47 +00:00
Tobias Hunger
7ab2ed5730 Pass C or Cxx toolchain to code model
Pass the C toolChain to the code model for all the C-versions creator
supports.

Change-Id: I0300a19d35861fcee76fb92ce14c6e04996bac7f
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-07-14 15:34:33 +00:00
Tobias Hunger
abcb276453 GccToolChain: Auto-detect C compilers
* Autodetect gcc and clang C compilers (in different flavors)

Change-Id: I7e61f2c6101b146ad63bb29278c05b1a574cf75e
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-07-14 15:34:24 +00:00
Tobias Hunger
ed8773c596 Kits: Show multiple toolchains in the kits options page
Change-Id: I6135fc089486252247981a33ff796328eabe9943
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-07-14 15:34:19 +00:00
Tobias Hunger
f1f4741615 ToolChainKitInformation: Warn on targetABI mismatch
Create a warning when targetAbis of the compiler mismatch. That means
that the compile output can not be linked together, which is probably
not what is intended.

Change-Id: I167ee526c1dec89d39698195e1feccea30a26825
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-07-14 15:34:11 +00:00
Tobias Hunger
cb14fb0d71 Kits: Save several ToolChains per kit
BREAKS BACKWARD COMPATIBILITY OF TOOLCHAIN SETTINGS!

* Convert old ToolChainKitInformation to new version
* Store several toolchains in one kit (one per language)

Change-Id: Ia59a2ad067c57971ec34ce9b2e43758344443755
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-07-14 15:34:06 +00:00
Tobias Hunger
ce9ca1f0ef ToolChain: Create toolchains for different languages
Enable creation of toolchains for different languages and wire
up the logic in the ToolChain Options Page.

Change-Id: I9fbd95607d30cc1aa10f73d6532338f07f3e2b4e
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-07-14 15:34:00 +00:00
Tobias Hunger
c071f68942 ToolChainOptionsPage: Enabling adding toolchains for different languages
Change-Id: I7e0984c6229c8583433a9efe0063337a18c5f716
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-07-14 15:33:56 +00:00
Tobias Hunger
d4624b9297 ToolChainOptionsPage: Handle toolchain languages
Properly display toolchain languages in the tree view of the
tool chains options page.

Change-Id: I27cb42cd2c5bf0cd7be8da921b94d8da10110841
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-07-14 15:33:52 +00:00
Tobias Hunger
ca04c4c264 ToolChainFactory: Add support for different languages
* Add a pure virtual method to get supportedLanguges with

Change-Id: Ida4445ca045c90fb9f7656a661af83e5b6801b30
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-07-14 15:33:40 +00:00
Tobias Hunger
1304b250eb ToolChain: Make sure all ToolChains have a language set
* Add code to toolchains
* Assert that this is the case in the toolchainmanager

Change-Id: I82452689e83279fd9d1afb3140b0070bef9b6cd8
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-07-14 15:33:33 +00:00
Tobias Hunger
dbf5f74352 ToolChain: Add a language field
* Make sure this field can not change during the lifetime of the
  toolchain
* Save/restore it, default to Cxx if no language is set in the
  toolchain.xml file

Change-Id: Ie79321f9913521b087cb8a735660cf1e1faeec3b
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-07-14 15:33:27 +00:00
Thomas Hartmann
dc6a3c4fef QmlDesigner: Remove triangle icons
Change-Id: I32e0cb8a2d1b406c464ada33685def1149626a72
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-07-14 15:30:17 +00:00
Tobias Hunger
43b0d2ad48 KitOptionsPage: Fix layout when showing/hiding kit details
Task-number: QTCREATORBUG-16261
Change-Id: Idf1beedfa427895a54498f1fb4658708ea5e4cc1
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-07-14 15:23:34 +00:00
Eike Ziller
defb18aef4 Algorithm: Fix build issue with MSVC2015
Be more specific on which overload to call.

Change-Id: Ie38252403774ea34c165daedd74c02bbed693439
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2016-07-14 13:29:41 +00:00
Tim Jenssen
dd009004f5 ClangBackend: fix windows build
Change-Id: I10aa1df96d5e1381056b33c03009ae19301a3f3e
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2016-07-14 12:21:02 +00:00
Ulf Hermann
5fe450fa63 Utils: Q_DECLARE_METATYPE Utils::Port
... so that we can pass it through signals

Change-Id: I11930f39372054271e94a0f07e3e2f8627f5ce1d
Reviewed-by: hjk <hjk@qt.io>
2016-07-14 12:03:16 +00:00
Ulf Hermann
5c32406296 QmlProfiler: Add binding loops render pass test
Change-Id: I64fbc8fae00e859ce6433ff85ceb5706675b88cc
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2016-07-14 12:00:40 +00:00
Ulf Hermann
55c26025f0 QmlProfiler: Move bindingLoopsDest() into QmlProfilerRangeModel
It's the only class that overrode it.

Change-Id: I15aa8177571e2eda6016e3aa16302fcbe94c3f11
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2016-07-14 12:00:15 +00:00
Ulf Hermann
25b9989749 Add wizard and mime type for SCXML
This allows us to easily add scxml files to a qmake project.

Change-Id: I2b5b21683f3e76062e6858fb8d0bceaa699a5569
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-07-14 11:41:05 +00:00