Commit Graph

49268 Commits

Author SHA1 Message Date
Thomas Hartmann
8f74cc3b7c QmlDesigner: Avoid second error message
We get editingFinished twice. By checking visible we able to ignore
the second signal.

Change-Id: Ic5ab91e153b1d658a68321436c71b914e065c6dd
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-01-04 13:21:20 +00:00
Marco Bubke
ada5ea1952 UnitTests: Fix names and disable slow tests by default
Slow and very slow tests have now their own test category. We add SlowTest
for tests which are slower than ~5ms and VerySlowTest if they are slower
than ~100ms. They are disabled them by "-*SlowTest.*". If you have a faster
machine than most developers simply try lower values. The aim is that most
developers can execute the tests in under ~2s.

In the long run we should use dependency breaking and data sharing to
reduce the count of the slow tests.

Change-Id: I8578071258d7f89b2052709f3dd526ced811483f
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2017-01-04 12:35:52 +00:00
Marco Bubke
719e6e0aff Fix README.md for linking with GCC >4 on Linux with Clang
Change-Id: Id0d1e4e5bc10adef96dd1d3afa65e3e4247f5815
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2017-01-04 12:21:44 +00:00
David Schulz
c9003ef265 Debugger: Cache pointer size in cdbbridge
Change-Id: Idf404a10f2a9cc3eff033123829ac5b564d7e172
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-01-04 11:58:55 +00:00
David Schulz
f4aa5d8494 Debugger: Use GetTypeId if module is known
Change-Id: Id8d742796ac89eb43778f2a2ece3a6717b27bc1c
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-01-04 11:58:50 +00:00
David Schulz
a95b3457a3 Debugger: Restrict symbols added to the list of locals
Change-Id: Ie1f7d717f1f9883f6545c128c1dd07c7932e0ec1
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-01-04 11:58:46 +00:00
David Schulz
34f4c758b5 Debugger: Reduce transfer of ownership in cdb python interface
Change-Id: Ie94e8c38095d05aae8b215b99d192acde4a13165
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-01-04 11:58:41 +00:00
David Schulz
efd3ce4627 Debugger: Extract type check data to functions
Change-Id: I07d44ef9ac88c627256394e0f3051c77a683bd36
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-01-04 11:58:37 +00:00
Andreas Pakulat
69159ab483 Refresh generic project when build config changes
Now that the generic manager can use data from the target or the build
configuration for expanding entries in its projects files it is
important that it reacts to changes of these entities. A change in the
build configuration can change the include directories or even compile
flags stored in the project configuration and hence the C++ code model
needs to be updated to reflect such changes.

The code is based on the qmake's project manager which has similar
functionality as far as I understood. The only difference is that the
generic manager won't attempt to refresh its state in the background (as
it simply can't do that right now) so the ui will be blocked for a bit.

Change-Id: I0a85e1ff0deeb876a7934b9a193a5d0f020047c7
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-01-04 11:08:49 +00:00
Andreas Pakulat
c79d290ca2 Expand macros in generic projects configuration files
This adds the ability to use macro's provided by various parts of
QtCreator inside the .includes or .files file. In particular the build
directory of the current build configuration or Qt variables of the
current kit (accessible through the active target's macro expander) can
be useful but I suspect its possible to find other use-cases as well.

Fall back to the project's own macro expander if there's no active
build target to allow this to happen some day, even if that expander does
not have many useful variables.

Change-Id: Ic3b7b744b5d0ae24247ad929b73d7c72abfb8bb3
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-01-04 11:08:36 +00:00
David Schulz
274ed92372 Debugger: Use qtHookData to get qtversion in cdbbridge
Change-Id: I243b6f69e52286c1c64f0c02350d3e4d4cfd6c69
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-01-04 09:06:22 +00:00
David Schulz
4571e0caec Debugger: Generate qtHookData symbol name based on module
Change-Id: I322cac9376b1789d87d3c704b4f1f89a0a892dbc
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-01-04 09:06:16 +00:00
David Schulz
1a98c6cfa7 Debugger: Make list of modules available in cdbbridge
Change-Id: I56938285c728ed0316326782aed47d418f08bc80
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-01-04 09:06:09 +00:00
Tim Jenssen
7dc64a1c1d Clang: fix dependency for "nmake check"
Change-Id: I82bca786a39a091804f9f39b1c037483dd595f5f
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2017-01-04 07:55:52 +00:00
Eike Ziller
3ef8ebd436 Explicitly mark experimental plugins as such in plugin overview
This makes the difference between "experimental" and "disabled" visible
in the UI.

Task-number: QTCREATORBUG-17368
Change-Id: I6a74d27dbad9d35f447fe5687fe26c4eee3a3808
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2017-01-03 14:21:18 +00:00
Eike Ziller
09e071b480 HelloWorld: Make DisabledByDefault instead of Experimental
Change-Id: I1828d49358cfaa01940600425d9b53bf122183a2
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-01-03 13:09:16 +00:00
Eike Ziller
7b3c2f33f4 UpdateInfo: Make DisabledByDefault instead of Experimental
Change-Id: If51b6cefd3dd985b26244ddb1f7b88c38e82ec9e
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-01-03 13:08:58 +00:00
Ulf Hermann
55d6997154 QmlProfiler: Only show pixmap cache size on cache change events
... and make the default size 0, rather than -1. Showing cache sizes
for individual pixmaps doesn't make much sense as other pixmaps might
get loaded at the same time.

Task-number: QTCREATORBUG-17424
Change-Id: Iead21c21d87b454ef03961d22119e0f5351d11ea
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
2017-01-03 12:40:42 +00:00
David Schulz
577ab21b30 Debugger: Add a "use python dumper" setting
Change-Id: I8bed1a8641e5cf46f50f7c9fced9a1b6c01964ed
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-01-03 10:58:07 +00:00
Christian Stenger
6137d14857 AutoTest: Avoid scheduling single shots if not necessary
This avoids doing internal stuff based on getting respective
signals if there is no active test framework.
The only signal that still will perform some more internal stuff
is triggering a rescan from the context or global menus.

Change-Id: I78f065b6bc77a100676d63248b438d3ebc71809b
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-01-03 07:02:10 +00:00
Christian Stenger
b9fc628bb9 AutoTest: Fix result tree for google test
Change-Id: I1f4a361a3c4ceb77c221d6549e42a1b7803ef305
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-01-03 07:01:37 +00:00
Christian Stenger
41ceac474b AutoTest: Avoid building tree of global items
Global items normally have no test name set. This patch avoids
adding global items below other global items.

Change-Id: Iabada78144ec48fc6687b360f79f1ef017c772a1
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-01-03 07:01:13 +00:00
Daniel Trevitz
a8854b680e RemoteLinux: Add incremental deployment to the TarPackageCreationStep
Patch adds incremental deployment to the tar ball creation. Allows for
only changed files to be deployed in a single tar ball.

Change-Id: I28a0bd1220503125b75a664323b72906b479b821
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2017-01-02 23:21:41 +00:00
Andre Hartmann
5d3cabb4e6 GenericProject: Remove unneeded check
toAdd is a QSet, so insert does nothing if directory is already
in the set.

Change-Id: Ic7d593414bef95a84f624c39208e29b0ec8c01f1
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-01-02 21:53:44 +00:00
Andre Hartmann
70556e8495 GenericProject: Cleanup and modernize
* Use nullptr instead 0
* Remove QLatin1{String|Char} where possible
* Use C++11 list init and auto
* Add some const as drive-by-change

Change-Id: Ife4c9c7b0869bcf2c864b88b8061ac6b7c3f33c0
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-01-02 21:53:23 +00:00
Orgad Shaneh
c2d25982a1 UnitTest: Add a missing include
Compilation doesn't fail since compileroptionsbuilder.h is indirectly
included before cpptoolsreuse.h.

Change-Id: I1f1b543a71546268e44fc9ec6c4a4530854e4659
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2017-01-02 15:01:26 +00:00
Thomas Hartmann
afb52340f6 QmlJS: Adding missing properties to Font value property
Task-number: QTCREATORBUG-17511
Change-Id: I2298bb76bc85b11954a0be1b551972dddefbebbf
Reviewed-by: Marco Benelli <marco.benelli@qt.io>
2017-01-02 14:47:35 +00:00
Ulf Hermann
018ba5a834 Rename the "ERROR" icon to "CRITICAL"
We mostly use this icon in terms of showing messages which might be
informational, warnings, or errors. We cannot call the icon "ERROR" as
that clashes with some macro on windows. To be more inline with Qt's
predefined messaging macros (qDebug(), qInfo(), qWarning(),
qCritical(), qFatal()), we rename the icon to "CRITICAL" and regroup
the entries in the header to suggest this usage.

Change-Id: I89880919d7ca54ea9c86de384eb29f375bf3075f
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2017-01-02 12:27:54 +00:00
Ulf Hermann
3ed12811e0 QmlProfiler: Remove unused include
Change-Id: If7334bc067fde54fcc7806c0e785fe694bcbcf4f
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2017-01-02 12:00:02 +00:00
Ulf Hermann
90e09f7658 QmlProfiler: rename requestId into typeId
No need to invent a new name for the same thing.

Change-Id: I370ec7be9c762642ae35e4f7a60ff9f5eb8ae3fe
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2016-12-28 10:48:42 +00:00
Ulf Hermann
795b8bcb9e QmlProfiler: don't manually delete parented QObjects
Change-Id: I8098cdb09fa347d7c792ee34e51ad31be85923a3
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2016-12-28 10:48:38 +00:00
Ulf Hermann
ba1f5efca5 QmlProfiler: Change statistics view labels
They should bei in line with how we call the event types in other
places.

Change-Id: Id6a5a42bdf745d6827deeca713a0e78c5fae4783
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2016-12-28 10:48:32 +00:00
Ulf Hermann
2ad8e27d53 QmlProfiler: Make the views accessible from the view manager
And then, drop some methods we don't need anymore.

Change-Id: I057bdc012072abddca2df83918ee9a0460f78611
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2016-12-28 10:48:14 +00:00
Christian Kandeler
beea69e486 QmlDesigner: Fix qbs build
Change-Id: Icf7470afb731ce8df015352a6d1a42dcd4343d1f
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2016-12-23 16:26:47 +00:00
Alessandro Portale
5101de0174 Utils: Add a toolbar variant for the edit_clear icon
Change-Id: I7236e37c1944f5f9d2334f1dc676c347a2b890ef
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2016-12-23 15:44:18 +00:00
Thomas Hartmann
2c3e3b6f9a Compile fix
Change-Id: If865afe9fa3cf4b3e1925b6a6138b2fddc88c7a9
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-12-23 08:28:55 +00:00
Tim Jenssen
d83a52338d QmlDesigner: add new TextEditorView
This is the first iteration but the text editor is not connect
to the others view in all expected cases.

Change-Id: I2fa29a23f9ce1d98d3d6cc8eabddb788525e39cd
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2016-12-22 10:37:07 +00:00
Thomas Hartmann
796da79b2a QmlDesigner: Adding auto completion for changing types
We reuse the ExpressionTextField but adjust a couple of properties.

Change-Id: Ib11c13e028b1211402eab69ba5a3dd6c9442de7b
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-12-22 09:50:41 +00:00
David Schulz
09441deb0e Debugger: Do not evaluate functions for msvc targets
Change-Id: I8c346d2353921ec128f9857ce3fda3d8410c73c5
Reviewed-by: hjk <hjk@qt.io>
2016-12-22 06:10:25 +00:00
Andreas Pakulat
82dcd1dadb Replace lookup in process environment with build environment
The generic manager looked up entries from the .includes and .files
configuration files in the process (i.e. QtCreators) environment. In
particular for the .includes file this is a problem, since it makes it
impossible to use environment variables specific to a particular build
environment.

In my case I'd like to access the QTDIR variable added by QtCreator to the
build environment to provide the generic manager with the Qt include
directories. Of course this is different when working with two kits that
have different Qt versions associated and hence its not possible to
hardcode a particular path in the .includes file.

This will break existing files that use the generic-manager-specific
syntax for environment variables ($$(VARNAME)) as the BuildEnvironment
uses the platform's native way to refer to such variables.

Change-Id: I1a684db82fdbfd163b6a215f9591c8e4bb57b25c
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-12-21 16:05:11 +00:00
Nikita Baryshnikov
d0e6853524 QmlJs: fix crash
Change-Id: I835f243fc34f4177a370c07d7e6c3dba3258942e
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-12-21 16:02:52 +00:00
Andre Hartmann
73e72b39c3 CustomParser: Remove compatibility settings
The new settings were introduced in Creator 4.0

Change-Id: Ic68125889574fe6ce6691de8f634d5ad096cd80a
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-12-21 15:54:15 +00:00
Tobias Hunger
aaf86ae636 SDKtool: Fix cmake related options to addKit
Change-Id: Ib51656957593b2f159bd4ef31e3be9840938cd81
Reviewed-by: Richard Pannek <richard.pannek@pelagicore.com>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-12-21 15:43:52 +00:00
Tobias Hunger
f27b332f9c CMake: Always put in a CMakeLists.txt file
Even if there was none found by the project reader. This can happen
when the cmake binary can not be started at all with the server-mode
reader.

I wanted to avoid just creating this node as that does mess with the
expansion state of the tree. But considering that we know that the
tree is empty otherwise that should actually not be a problem.

Change-Id: I5ae5ed3e2fa7eebdfc1f9b7d55d70417abfcd125
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-12-21 15:25:30 +00:00
Tobias Hunger
8f885a5b2e CMake: Fix WS in servermode reader
Change-Id: I797d3c7025ee43f722ed137d911c58acb4b8e1f0
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-12-21 15:25:23 +00:00
Tobias Hunger
b11726bf05 CMake: Do not list <Build Directory> twice
Do not list <Build Directory> twice when switching from a temporary
build folder to the real one.

Change-Id: Id7d5f4a4b48d6c63dd4c7da2932b6a857ff0c7f7
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-12-21 15:25:19 +00:00
Ulf Hermann
35782c8e9e QmlProfiler: Drop some useless members from statistics view
Change-Id: Ic116ecaa0cb6bf5d17b4351bd751a013cd5b9636
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2016-12-21 14:36:30 +00:00
Tobias Hunger
879aa21063 SessionManager: Make session node a unique_ptr
Change-Id: Ic11679c409305a5f117316114e9ffa3d82475ceb
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-12-21 14:24:55 +00:00
Tobias Hunger
5d8134f57c ProjectTree: De-duplicate functionality
Change-Id: I465e07c0764ca3dcbf6a6082670b140eb2b01374
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-12-21 14:22:41 +00:00
Tobias Hunger
63cf5b8ad6 ProjectExplorer: Use more const
Clean up action update and use more const variables. Spread some
const over other code, so that const variables can actually be used.

Change-Id: Ia814900ddff294aeafedb2a223d3705990f9b7c1
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-12-21 14:22:26 +00:00