Commit Graph

44349 Commits

Author SHA1 Message Date
Rafael Roquetto
501bf4918f Fix CDB detection
To make sure CDB is really installed on a Windows Kit, we need to assure the
'inc' subdirectory is present. Before this patch, if, for instance, the
Windows 8.1 kit is present (including a Debuggers subdirectory), but without
CDB, the first test under "32-bit" qmake will yield a false positive,
preventing the following 32-bit kits to be tested, then to fail under the
64-bit qmake test because the 'inc' directory is inexistent, finally
bringing about an empty CDB_PATH variable.

Change-Id: I1d7cf3350f4a63a556ef106faa5b3f0593dcf8c8
Reviewed-by: Andrew Knight <andrew.knight@intopalo.com>
Reviewed-by: Brett Stottlemyer <bstottle@ford.com>
Reviewed-by: David Schulz <david.schulz@qt.io>
2016-10-31 06:37:29 +00:00
Thomas Hartmann
2cab55ea1a QmlDesigner: Allow JavaScrip blocks in Connections in .ui.qml
Inside a Connections item JavaScript blocks should be allowed.

Change-Id: Ia6a08fc575a72980bd53a32249bf302b7a426266
Reviewed-by: Marco Benelli <marco.benelli@qt.io>
2016-10-28 14:27:58 +00:00
Christian Kandeler
11dd0f4c6f Update qbs submodule
To HEAD of 1.6 branch.

Change-Id: Ideda150d8126e09fa105b3b85848f7af102a29d4
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2016-10-28 14:16:07 +00:00
Tobias Hunger
b75c6444d1 Core: Add a reaper that will asynchronously clean up QProcesses
Change-Id: Ic24dde261eac775d1a5854b8dbcbfeb002d0f729
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-10-28 12:28:46 +00:00
Ulf Hermann
424005c911 QmlJS: Release the same documents we keep before
When rescanning imports we generally get a new version of the parent
document. When replacing the cached documents we want to release the
old ones, not the new ones. Failing to do so leads to types
disappearing from the QML code model and to leaking memory.

Task-number: QTCREATORBUG-17175
Change-Id: I3994444ac0a6cd87f9d9d0b47ab3d6015660e416
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-10-28 11:39:18 +00:00
Eike Ziller
ff21689487 iOS: Make runSimCtlCommand static
Doesn't depend on state.

Change-Id: I6c0004bf6b6d1e30171b08e1b404d82242c42d99
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
2016-10-28 10:06:23 +00:00
Ulf Hermann
c0ff0b7237 IosTool: Always listen on both IPv4 and IPv6
We don't know which protocol QtCreator will choose to connect to the
QML debug server. Currently QtCreator uses whatever "localhost"
resolves to.

Change-Id: Id41fb54e5eb975581d382767bdd125fbb9801f4f
Task-number: QTCREATORBUG-17141
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-10-28 09:06:54 +00:00
Ulf Hermann
779c54872a IosTool: Don't restrict the number of pending connections
Apparently a failed connection counts as "pending" for a while before
it is finally removed. The QML profiler aggressively tries to connect
with different timeouts and multiple sockets, so quite often there is
such a failed connection which then prevents new connections from
getting established.

We already enforce the limit of only one successful connection via the
SingleRelayServer subclass.

Change-Id: I441e2ed898d28f04359a9976d5b25569b8447f3f
Task-number: QTCREATORBUG-17141
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-10-28 09:05:39 +00:00
Orgad Shaneh
a6427453f4 Fix icons that moved from core to utils
Change-Id: Id3151b1cce2d97b2bfb6debaf3cebe53cd6d88ed
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-10-27 16:12:35 +00:00
Tobias Hunger
aa118539a4 CMake: Fix warnings about cmake configuration model
The index was handled wrongly.

Change-Id: I8a98c7a16e32798a9b7662c6c5c1683d248580da
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-10-27 15:01:53 +00:00
Daniel Kamil Kozar
949215341d Actively monitor the recent projects list for the projects' existence
Instead of checking whether the recent projects exist on startup, check
it before returning the project list.
Additionally, update the welcome page (and thus projects) when the
application state changes, which gives the proper behavior when
minimizing or switching between applications.

Change-Id: Ib172f0b53fdc65fbd6de00041920f246d10da6a5
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-10-27 14:49:02 +00:00
Ulf Hermann
10ddde4125 iOS: also process stderr to look for QML debug port
This is where the "Waiting for connection ..." message usually appears.

In general this mechanism of first replacing the port in the message
and then parsing the message to figure out that the iostool (not the
application) is actually listening is very confusing and backwards,
but fixing this is material for the master branch.

Change-Id: I73d3c5a34482403d275e6ea7a9ad59996121b02e
Task-number: QTCREATORBUG-17141
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-10-27 14:08:35 +00:00
Tobias Hunger
bacb0a74a0 Qt options page: Simplify code a bit
Change-Id: I70ea3134550c01f6c81f8a15d2730dc906d834a7
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-10-27 13:59:23 +00:00
Thomas Hartmann
48537ca197 QmlDesigner: Crash fix
Editing subcomponents should only be possible for
graphical items.
Qt Creator was crashing in case the node was something else.

Change-Id: Ia0e286c666b0b485da0817678ca2048ace260c9b
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-10-27 13:19:15 +00:00
Thomas Hartmann
d8eb2bf762 QmlDesigner: Fix warning
Change-Id: I751ef6b28dd57a98b1989a875d4c367f8bf50ece
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-10-27 13:19:09 +00:00
Orgad Shaneh
3de8b56d88 Theme: Remove some more unused entries
Change-Id: Ie2df7520871db21930c39fd976fa8739d354a2dc
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-10-27 12:54:22 +00:00
Tobias Hunger
4f374d4bbf Android: Clean up Kit updates
Change-Id: Iab45062012fb91a8f62ee227af8b6a7ab94a8fed
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
2016-10-27 10:36:44 +00:00
Tobias Hunger
5a2001f730 Android: Add C toolchains
This should fix kits complaining about wrongly set C compilers and
ABI incompatibility between C and C++ compilers.

Task-number: QTCREATORBUG-17165
Task-number: QTCREATORBUG-17166
Change-Id: Ia002490b471e0f5306c3a76b27158869920452ed
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
2016-10-27 10:36:02 +00:00
Eike Ziller
cf47f3e807 Merge remote-tracking branch 'origin/4.2'
Change-Id: Ia346d86ad5fabe9d91454ea642cbeac5ec862699
2016-10-27 12:10:26 +02:00
Tobias Hunger
c777bd32bc QtSupport: Do not show Type column in Qt options page
Nothing ever fills that column, so do not bother to show it.

Change-Id: I5787aa72ee5c414fbf01ca01eed3aea20b6b7201
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-10-27 10:01:10 +00:00
Orgad Shaneh
0e134d260e Theme: Remove unused icon entries
Change-Id: I867aa0b8737b56fc3e8d357bb1559acad740ccf0
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-10-27 09:39:42 +00:00
Thomas Hartmann
6eddf41886 Documenting QmlJS error message
I also fixed the "."

Change-Id: I65cdc6be8b2de31af411d1172780281afd20a4f9
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-10-26 16:41:53 +00:00
Tim Jenssen
55db42fe2c QmlDesigner: remove styling of the output pane
Setting objectnames to reduce possible influence to other
widgets.
Introduce a background QWidget to set the background color.
AutofillBackground was not working for unclear reason.

Change-Id: I4acd5b7ed5ff9d63b5320b133a82099c5888b839
Task-number: QTCREATORBUG-17172
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-10-26 16:33:08 +00:00
Thomas Hartmann
61dadc6da1 QmlDesigner: Disable validator in any case
We have to disable the validator even if the root node has no id.

Change-Id: I021c33909dfa7c3aa3154d1782a589cef9151af5
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-10-26 16:14:20 +00:00
Thomas Hartmann
e012e42ff2 QmlDesigner: Do not allow certain ids
Some ids are likely to create issues, because they collide
with property names.

Change-Id: I688ed0751c227afdd3ef59ba0f31b1334b26eaea
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-10-26 16:10:51 +00:00
Thomas Hartmann
99aaf86a33 QmlJSCheck: Add error for ambiguous ids
Certain ids can be ambiguous and have name clashes with properties.
Those ids are not supported in the designer.

Change-Id: Ida293d24611c467df6ef813a541e8abfc06b51cb
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-10-26 16:08:29 +00:00
Thomas Hartmann
de6021c71a QmlDesigner: If no types are available the dialog is implicitly canceled
Task-number: QTCREATORBUG-17179
Change-Id: I89cf2240f9f54072dc35c40fb56a709284ff3187
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-10-26 16:05:05 +00:00
Tim Jenssen
a0f1473dc1 QmlDesigner: remove unnecessary code
Change-Id: Ib10fa0513f326b3047b93f8cbedc1a11f2bd1f90
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-10-26 16:02:59 +00:00
Tim Jenssen
e25ac57f38 QmlDesigner: spaces only change
Change-Id: I1ecb9425148843558e8bf2deffde2aa2290ded4b
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-10-26 16:02:48 +00:00
Alessandro Portale
2534cb017b ScxmlEditor: Fix the align* and adjust* icons
Use toolbar variants in the toolbar and menu variants in the menu.

Change-Id: Ie79631d80ff0f2c4c3b19b216def10d79bdd8454
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-10-26 15:30:29 +00:00
Tobias Hunger
3cfa0c0de7 Qt: Do not send dataChanged if nothing changed
When setting the warning/error icon on a Qt version in the Qt options
page: Do not send dataChanged if the icon has not actually changed.

This fixes the selection getting broken when two Qt versions happen to
have the same displayName.

Task-number: QTCREATORBUG-16644
Change-Id: I7722fbc021388be237e59a59bd136c61f611ad52
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-10-26 13:44:59 +00:00
Ulf Hermann
2d95057434 QmlProfiler: Open load and save dialogs deferred
This works around QTBUG-56746, by decoupling the dialog from the
context menu.

Change-Id: I2f13b01003a10598e6f69b14bb7eb8e9141acad8
Task-number: QTCREATORBUG-17149
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-10-26 11:46:48 +00:00
Tobias Hunger
ca6f37f3bd SVN: Fix topic
Use svnversion in favor of svn info to report the topic for SVN versions.

Task-number: QTCREATORBUG-13611
Change-Id: Ia1f61c0d3b9bfb871d42449478029835c7b2796f
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-10-26 11:01:04 +00:00
Ulf Hermann
e07b495b70 QmlProfiler: Don't delete QObjects from outside their home thread
We cannot do this because the parent object needs to be notified.

Change-Id: Id70de2acea4aa241ea0e85b5b02327e1f91b7e68
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-10-26 10:56:23 +00:00
Alessandro Portale
d54da12af9 CPlusPlus, Utils: Move namespace icon from CPlusPlus to Utils
...so that it can be used in the ScxmlEditor plugin

Change-Id: I0e0ed050f7765bcc901db3bb2c3273456a228b5e
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-10-26 10:45:06 +00:00
Alessandro Portale
77f68653b0 ScxmlEditor: Themable "Pan" icon
Change-Id: I2041801fb8d300515c3bea26bccda0c606cd2abe
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-10-26 10:17:00 +00:00
Christian Stenger
492c0cd004 AutoTest: Make separating line of test results slightly darker
Especially for darker themes the brighter color was quite too
aggressive.

Change-Id: Ib37e7524c035e300768159e0950e593036c7f6a4
Reviewed-by: David Schulz <david.schulz@qt.io>
2016-10-26 10:00:28 +00:00
Christian Stenger
cbc4ee0af6 AutoTest: Fix enabled state of global Tests menu
If tests are running the Tests menu's (current) items are all disabled
which led to having the menu disabled as well.
Ensure to have the menu enabled regardless the sub items' state.

Change-Id: I561f1eb75637f03a27df012129455e06be38ea87
Reviewed-by: David Schulz <david.schulz@qt.io>
2016-10-26 10:00:19 +00:00
Christian Stenger
2b27f30538 AutoTest: Reduce re-parsings while editing single file
Change-Id: If3dbcb3026733873881921cb9208b7c9da33c8de
Reviewed-by: David Schulz <david.schulz@qt.io>
2016-10-26 10:00:10 +00:00
Christian Stenger
99a82f7035 AutoTest: Simplify settingspage creation for frameworks
Change-Id: Icb262e48a7980748cb0f03e578a49ca26d0c6b29
Reviewed-by: David Schulz <david.schulz@qt.io>
2016-10-26 09:59:57 +00:00
Nikolai Kosjar
a102ee0729 Clang: Allow avoiding supportive translation unit for debugging
...by providing QTC_CLANG_NO_SUPPORTIVE_TRANSLATIONUNIT=1 in the run
environment.

Change-Id: If4e92521dfbc2752e4446e7037876d28683c1f66
Reviewed-by: David Schulz <david.schulz@qt.io>
2016-10-26 09:20:15 +00:00
Christian Kandeler
f911ddba86 QbsProjectManager: Remove a redundant header file
Somebody mistakenly introduced qbsconstants.h, even though
qbsprojectmanagerconstants.h already existed for that purpose. Merge
these two files and remove the newer one.

Change-Id: I6103509d902880d0e9c181873ec4cf56acf04424
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2016-10-26 08:21:31 +00:00
Orgad Shaneh
44f5343970 ProjectExplorer: Use Build by default in Build & Run settings
This preserves the behavior of 4.1.

Change-Id: I071ef1c6bf0be88aa7b9787114cbac5292910125
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2016-10-26 08:09:32 +00:00
Tobias Hunger
371ab14c6e VariableChooser: Sort model
Task-number: QTCREATORBUG-16670
Change-Id: I9dc3641409dbd351491f8b91795bb0adafcb686d
Reviewed-by: hjk <hjk@qt.io>
2016-10-26 08:08:50 +00:00
Friedemann Kleint
5378aef691 CDB extension: Limit number of frames in the QML stack
Retrieving the full stack has been observed to hang.

Task-number: QTCREATORBUG-17097
Change-Id: I628ac5f2ff9790b700e6eb97e341d3996a03c8d8
Reviewed-by: David Schulz <david.schulz@qt.io>
2016-10-26 06:55:32 +00:00
Friedemann Kleint
bb380a00f0 CDB extension: Also look for QV4::ExecutionEngine for the QML stack
The struct has been renamed from QV4::ExecutionContext to
QV4::ExecutionEngine in Qt 5.7.

Task-number: QTCREATORBUG-17097
Change-Id: If9685d039d3d1f9caf369ec847ac6705747ae9f7
Reviewed-by: David Schulz <david.schulz@qt.io>
2016-10-26 06:55:25 +00:00
Alessandro Portale
2428135319 ImageViewer, ScxmlEditor: Use the new "Fit to view" icon
Change-Id: I4261e2a91b2c2b310b571ac2657998dcc0756be6
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-10-25 22:12:05 +00:00
Alessandro Portale
d466dc916a Utils: New "Fit to view" icon
Change-Id: I2592cb79a8dd7bad100c466cb45cf30039bace18
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-10-25 22:11:43 +00:00
Alessandro Portale
dc25b692fa ScxmlEditor: Themable toolbar icons for Adjust and Align actions
Change-Id: Ibd3a70a17362431fb1b11aecd18e9af6276b30c3
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-10-25 20:21:49 +00:00
Tim Jenssen
f35d71478d QmlDesigner: use list initialization
Change-Id: Iecc075d82c5b26589a6201a3b1adb04f59c92db0
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-10-25 17:17:20 +00:00