Commit Graph

44349 Commits

Author SHA1 Message Date
Ulf Hermann
68f0d637a6 Timeline: Expose theme as singleton type
This allows us to look up the colors by their enum values, rather than
by strings. Lookup by string is prohibitively expensive as the whole
QVariantMap of theme values has to be converted into a JS object
repeatedly and the strings have to be converted between QString and
QV4:String all the time..

Change-Id: Id131840b1a6e1eaabbd8966d60b9baf1ebed00c1
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2016-12-13 14:26:28 +00:00
Ulf Hermann
27e9785ce8 Theme: allow taking implicitly shared copies of the creator theme
We want to install the theme as singleton in various QML engines.
QML engines take ownership of their singletons and want to delete them
on exit. In order to accommodate for this we need copies of the theme.
As all the containers in ThemePrivate are implicitly shared, it
shouldn't be a lot of effort to copy it.

Change-Id: I52391add2fe8f540c19c804945ce9d9161905b90
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2016-12-13 14:26:23 +00:00
Nikolai Kosjar
249b55323d CppTools: Fix tests test_mixed{1,2}
Change-Id: I573b6d1aa4f8abb3be0205f6467ed088c805bb6e
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-12-13 14:14:46 +00:00
Ulf Hermann
43dbed9919 Revert "Debugger: Remove 'Context' label in debugger console"
As we can have a context again now, we should be able to show it.

This reverts commit 8679a7caa6.

Task-number: QTCREATORBUG-17177
Change-Id: I221628dc91af839be867cc1bf8dfe5d5163fd321
Reviewed-by: hjk <hjk@qt.io>
2016-12-13 13:15:18 +00:00
Eike Ziller
697b612a88 Fix tab order in find tool bar
Task-number: QTCREATORBUG-16997
Change-Id: I169d98f5d4701f74c58aec4c1d567938998c898c
Reviewed-by: David Schulz <david.schulz@qt.io>
2016-12-13 13:08:18 +00:00
Eike Ziller
113b6f1941 AutoTest: Remove experimental state
Change-Id: Ia9fa7679fec7a0cce26bbcba8090edf9841dd63f
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-12-13 13:06:47 +00:00
Nikolai Kosjar
56fd0daf84 Clang: Fix build
Change-Id: I279f5641f3e9a54e6d03003cd6b4e2740e54aa15
Reviewed-by: Florian Apolloner <florian@apolloner.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-12-13 12:44:12 +00:00
Ulf Hermann
d06a1e09f1 Theme: make relevant methods Q_INVOKABLE
Change-Id: I397d473e5414b705c3e61b4344464fb018b3f676
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2016-12-13 12:17:42 +00:00
Ulf Hermann
071b1551b3 QmlProfiler: Make sure we can handle inconsistent trace data
Apparently some versions of Qt can produce traces with unmatched start
and end events. We should not crash on those.

Change-Id: Idfb3273f02470156e9f1863c43477d0c3494e0d6
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2016-12-13 12:02:21 +00:00
David Schulz
2c98573e70 Debugger: Fix getting child value by index
Take all ancestors into account when calculating the offset
of the desired child.

Change-Id: Iaa187c1c918589d9aee8325b1ef3692894f5be55
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-12-13 11:59:32 +00:00
Ulf Hermann
de589042c0 QmlProfiler: Fix sorting of statistics items
Enforce the presence of a sort role for all items and make sure we
don't call column() during sorting. column() can be very expensive on
large models.

Change-Id: I89555072d8ef051d6e0b4f9819159238a1a40859
Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
2016-12-13 10:10:54 +00:00
Ulf Hermann
2b49c3b2b3 QmlProfiler: Avoid showing "NaNb" as memory in flame graph details
Change-Id: Ic06885d6c898036efba9b11beb13209351b2629a
Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
2016-12-13 10:10:29 +00:00
Ulf Hermann
e826a461c1 QmlProfiler: Drop type from flamegraph details
It is unnecessary as it's already shown in the title, and it wasn't translated,
so it showed as "undefined: <blah>".

Change-Id: I063b78df5778d17db8849f73c470184546e0daeb
Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
2016-12-13 10:10:12 +00:00
Ulf Hermann
25bb2122fe Drop manual binding on selectionLocked
There is only one way to set selectionLocked during regular operation.
The double binding is unnecessary overhead.

Change-Id: I324022a9c49e9a1936fd70371429318d207b4843
Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
2016-12-13 10:10:01 +00:00
Ulf Hermann
a01d946711 Timeline: Optimize incrementStartIndices()
Don't repeatedly ask for size() and don't repeatedly dereference
items by index.

Change-Id: I9f0301e65e28dcde483230875535470290ce4876
Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
2016-12-13 10:09:48 +00:00
David Schulz
16b44c80f6 Debugger: Update subtree if partial variable is requested
Instead of dumping the complete locals just dump the subtree
with the partial variable.

Change-Id: Ieac5f62efd87144bbea7a6a559d8be8d48d9084e
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-12-13 09:58:52 +00:00
David Schulz
b352082a45 Debugger: Reuse symbol group for value creation
Change-Id: I8a850806eaec1a8d3cc1f8135519a61790fa97c6
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-12-13 09:58:43 +00:00
David Schulz
22643d4524 Debugger: Add infrastructure to reuse symbol groups
Change-Id: I91eeba7438afb27f23d451c55bdff9006e0c4eb4
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-12-13 09:22:18 +00:00
Nikolai Kosjar
02d8e2af1b CppTools: Clean up ProjectInfo
Change-Id: I5d0db45d9fdb624bb6cc55d7f04061d553f13bce
Reviewed-by: David Schulz <david.schulz@qt.io>
2016-12-13 09:15:25 +00:00
David Schulz
203385482c Debugger: Initialize name buffer with correct size
Change-Id: I82ef4091413b815e0086bbe622971730865b3936
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-12-13 08:57:58 +00:00
hjk
4721888fa7 FakeVim: Force leaving input mode when switching editors
Change-Id: I9c871cf7b0cba027b8a0ec201dd57f1039c9f4a5
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
2016-12-13 08:54:12 +00:00
David Schulz
1236f0a51c Debugger: Add option to get type name with module
Change-Id: I7d58d1e750e1982cce62647aae07f1b6f5e41091
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-12-13 08:47:34 +00:00
David Schulz
3a00616395 Debugger: strip "const" from typename end
Change-Id: I9c841c42bbcde78362a1b9c624015175a6368c34
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-12-13 08:41:27 +00:00
Nikolai Kosjar
7381736cf3 CppTools: Clean up ProjectPart
Change-Id: Ia7969ceb52ffb25e7c63b24bc33b091001e9b50a
Reviewed-by: David Schulz <david.schulz@qt.io>
2016-12-13 08:33:14 +00:00
Nikolai Kosjar
a10bfb8400 CppTools: Do not hardcode default language version
...instead, use the latest we support.

Change-Id: I7e7768bc4bc31de1fe0f441c03f3ab5d677d76e8
Reviewed-by: David Schulz <david.schulz@qt.io>
2016-12-13 08:33:09 +00:00
Nikolai Kosjar
602ad72d42 CppTools: Refactor ProjectPartBuilder
...and add some basic tests.

Introduce the abstractions ProjectInterface and ToolChainInterface in
order to break the dependency to the ProjectExplorer. Also, some simple
logic can go there to simplify the (Base)ProjectPartBuilder.

Change-Id: I6c50a1804ce62098b87109931eb171f5c2542937
Reviewed-by: David Schulz <david.schulz@qt.io>
2016-12-13 08:33:04 +00:00
Christian Stenger
95fa59dd6c Cmake: Fix regular expression
Change-Id: Ibcd5f62ace4adb4516ecaeba987eb8747996ba04
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-12-13 05:44:44 +00:00
Robert Loehning
b0fa868758 Android: Use numerous form
Change-Id: I4b9bb8ef1053f1dc86547f618b35746e1f9b06a6
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-12-12 17:24:37 +00:00
Tim Jenssen
2680e8f12e ImageViewer: remove unnecessary class forward
Change-Id: I39df5ceeb3fb07b039d5ad1388db866e8aaccc04
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-12-12 14:48:45 +00:00
Tim Jenssen
1898ba5ad3 make library defines more consistency
Change-Id: I211d511667d5b9c8f518bfbe750aca4483baff62
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-12-12 14:48:34 +00:00
Alessandro Portale
1ff8b46d0a Utils: Create _TOOLBAR variants of some standard icons
And use these in scxmleditor. qmldesigner will also use them.

Change-Id: Ifd057531873a8cb8da3d6e033fbf606f17638c3e
Reviewed-by: Marco Benelli <marco.benelli@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-12-12 14:19:29 +00:00
hjk
6bb0880a6b ProjectWindow: Rename SelectorModel to ProjectWindowPrivate
Less quirky, and that's what it is now.

Change-Id: Iae18f289ab498eb409579235e96325a7d0341e1a
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-12-12 14:00:50 +00:00
Nikolai Kosjar
3a369552c6 CppTools: Classify ambiguous headers depending on other files
This applies for all project managers, except qmake. The qmake project
manager will make use of this in follow up changes.

Before, "foo.h" was always recognized as a CXXHeader. Now, it depends on
the other files. E.g. in a file list {"foo.h", "foo.c"} foo.h is now a
CHeader. In {"foo.h", "foo.c", "bar.cpp"} the file "foo.h" is ambiguous
and we will create two project parts, one where it is a CHeader, the
other where it is a CXXHeader.

Change-Id: I50505163368742584b1380c284d42cbe07cb4fc9
Reviewed-by: David Schulz <david.schulz@qt.io>
2016-12-12 13:49:09 +00:00
hjk
f54d4fc3db Core: Don't assert on valid nullptr cases
Change-Id: I40919e9ba16c2cc8cf401fc0c9f49267a215af71
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-12-12 12:23:20 +00:00
Andre Hartmann
81ebdf3b02 Git: Add rebase --skip action
Task-number: QTCREATORBUG-17350
Change-Id: I42f081dbdb47c78055c7167ff47c7f3d9af4c856
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-12-12 12:15:12 +00:00
Christian Stenger
69a94c2c28 AutoTest: Always parse if plugin is enabled
Remove the 'Always parse' setting and respective special handling.
This simplifies the handling of parsing for tests and removes
strange special handling that was introduced in earlier versions
and led more to confusion on the user side.

Change-Id: Ia4d122ed448244f3cb3876dda9930864afde9c28
Reviewed-by: David Schulz <david.schulz@qt.io>
2016-12-12 10:57:47 +00:00
Orgad Shaneh
6a1ead7abb Fix clangrefactoring disabling logic
* Disable only for MSVC which is < 2015 update 3
* Fix isEmpty test

Change-Id: I35b396f547d3a1e78713797266ede9f8fbbb9f72
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2016-12-12 10:34:46 +00:00
Tim Jenssen
6bf4157491 CMake: fix not disconnected build action
The old code was disconnecting all signals from CMakeProjectPlugin
to m_buildTargetContextAction. The result was more and more triggered
actions.

Change-Id: I8d7db5852c03d5388870a7460efb3a8a28fd0749
Reviewed-by: Florian Apolloner <florian@apolloner.eu>
Reviewed-by: Alexander Drozdov <adrozdoff@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-12-12 10:20:54 +00:00
Tim Jenssen
b91632e642 CMake: fix crash while clicking context menu
It crashed if the root project had some error
and I tried to build a subproject.

Change-Id: I13dc620402a5f79e507e7da3fedb5eb09a4112da
Reviewed-by: Alexander Drozdov <adrozdoff@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-12-12 10:20:35 +00:00
Tobias Hunger
a08a4a4842 CMake: Sort generator by name before displaying them
Task-number: QTCREATORBUG-17404
Change-Id: Ib20403a59bf01b71f0d317fc003d8484d215fcf5
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-12-12 10:17:32 +00:00
Tobias Hunger
d25a12404f AbstractProcessStep: Initialize future interface pointer
Change-Id: I57d0ab6add9d0c3e325447dfc5a8dfe40dd3a770
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-12-12 10:14:25 +00:00
Oswald Buddenhagen
9ce62e5c8e fix coverity complaint the right way
use an assert to document in a machine-readable form that the file is
expected to be null-terminated. this supersedes 5a58e962's approach of
appending a null char, which would just obfuscate a problem in the calling
code if it were to ever have an effect.

Change-Id: Iaedb575d20abb42d98e011949e792ecf4dde3e93
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-12-09 13:54:28 +00:00
Ulf Hermann
b9a8bed037 QmlDebugger: Pass selected watch item as context to V4 debugger
Newer V4 debug servers will accept a "context" parameter which
specifies the ID of an object which is then used to look up a QML
context to inject when evaluating expressions.

Change-Id: I9d2a2226559380550308cacfe559e079291c14b5
Task-number: QTCREATORBUG-17177
Reviewed-by: hjk <hjk@qt.io>
2016-12-09 11:55:54 +00:00
Eike Ziller
0abd6dcd82 Merge "Merge remote-tracking branch 'origin/4.2'" 2016-12-09 11:42:58 +00:00
Eike Ziller
c175f1e62f Merge remote-tracking branch 'origin/4.2'
Conflicts:
	src/plugins/ios/iosdevice.cpp
	src/plugins/ios/iossimulator.cpp
	src/plugins/projectexplorer/projectwindow.cpp
	src/plugins/qmakeprojectmanager/librarydetailscontroller.cpp
	src/shared/qbs

Change-Id: Ie98e2401a2259903141a13170c78388f2da467d2
2016-12-09 12:42:01 +01:00
Christian Stenger
cdd94cbb02 AutoTest: Make results tree a real tree
Provide a way to control how the results tree will be
generated for the respective test framework and use
this information to construct a real tree.
Basically this changes the layout of Qt test results,
but keeps the former layout of Google test results.

Task-number: QTCREATORBUG-17104
Change-Id: I7fca4d8e365bfebcca4cf7855cf6a882e5379143
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-12-09 11:33:27 +00:00
Christian Stenger
5b6e9671d7 AutoTest: Small refactoring of addTestResult()
Just some simplifications and restructuring.

Change-Id: I2a2a66808f1721e7ce9dc47e20194d544c093092
Reviewed-by: David Schulz <david.schulz@qt.io>
2016-12-09 11:33:14 +00:00
Orgad Shaneh
5071dd80cb QmakePM: Sort function keywords
They are searched using std::binary_search, which expects sorted input.

Change-Id: Ib2d59ab6e747e6ce36220dfd33dbe9bb145aeb92
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-12-09 09:55:44 +00:00
Tobias Hunger
77b8198c2b RemoteLinux: Make sure there is a DebuggerRCAspect
Only offer to run runconfigs with the DebuggerRCAspect set, assert
that it is indeed there and never check for it again.

Change-Id: I5e9b329efb15d56ae221aed3ea2a75caa1078c18
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2016-12-09 09:52:10 +00:00
Christian Kandeler
4d34270874 Update qbs submodule
To HEAD of 1.7 branch.

Change-Id: Ifde10cab3dd3f93cd95a2cb72a9017866683802a
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-12-09 09:50:32 +00:00