Commit Graph

54723 Commits

Author SHA1 Message Date
Tim Jenssen
ab6feb9185 Wizards: fix checked uncheckedValue documentation
Change-Id: I9203eb88b12532e327751f85d94ce23900253d5e
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-11-09 14:13:43 +00:00
Eike Ziller
b05637131c Merge remote-tracking branch 'origin/4.5'
Conflicts:
	src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp

Change-Id: I726babe61e28db14d06a6a1a5c570e148745b458
2017-11-09 14:32:00 +01:00
Leena Miettinen
1bb6ebd5a0 Doc: Describe running apps from the Application Output pane
This saves time when developing Qt Quick applications, because
the QML files are interpreted at runtime. Therefore the
app does not need to be recompiled if only QML files changed.

Update the screenshot to make the Run button more visible.

Change-Id: I0ff2a1ca0fc24102e9c87b00896c387c18d0f1f1
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-11-09 12:03:56 +00:00
Thomas Hartmann
8d38f05ffc QmlDesigner: Remove unused function
Change-Id: If2850329cc96e1ee7aba303e1ad56226d976f60b
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2017-11-09 11:39:21 +00:00
Christian Stenger
938b3423a9 AutoTest: Ask for run configuration only if needed
If we cannot determine which executable to run we ask the
user to specify which run configuration to use, but if there
is only a single run configuration assume this one as
correct and just pick it up without asking the user
every time.

Task-number: QTCREATORBUG-19200
Change-Id: Ie45cf354b595bc666a595f51844ad2453655e0da
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-11-09 11:24:04 +00:00
Tim Jenssen
e5d832f2cc QmlDesigner: remove "Editor" from "Status Editor"
This saves some space in the tabs.

Change-Id: I968378de7d7a6331a41c79944ce910e23e63f2fd
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-11-09 11:11:51 +00:00
Ulf Hermann
5fabf9af64 QmlProfiler: Reset the serverRecording flag when the connection drops
Otherwise the run control will believe that the application is still
running.

Change-Id: I16ec9762362f526bd89eb21ceb82b89b295d7b5c
Reviewed-by: hjk <hjk@qt.io>
2017-11-09 10:54:48 +00:00
Thomas Hartmann
1fa7ad2116 QmlDesigner: Expose some helpers for theming
Change-Id: If86165ab9eb90b67f22c08d894b79f4db7c03765
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-11-09 09:40:48 +00:00
Alessandro Portale
249bea0e44 Flat Dark theme: Make disabled buttons distinguishable from enabled
Task-number: QTCREATORBUG-19235
Change-Id: Ia7f0cc453ab38cb4d95b0f5de1a3261fd46aecdf
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-11-09 08:49:28 +00:00
Tim Jenssen
0c79114f41 QmlDesigner: fix replaceCssColors
Change-Id: I1b4f084c3bb88a68a5a54be2f68e86ec30996dfd
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-11-09 08:26:43 +00:00
Tim Jenssen
9cb56f4d73 QmlDesigner: just color the background
Keep the style responsibility add the widget. So coloring the
background with a helper widget is enough here.

Change-Id: I24bb82786e2a8ef4af01b9719d2bad4aa1997f1f
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-11-09 08:26:37 +00:00
Robert Loehning
84c0390bdc Squish: Update Creator's sources to v4.4.1
Change-Id: I95ba4de5ec0148b602d91b684dabc09e954d52ca
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-11-08 16:47:39 +00:00
hjk
45f73d8729 Debugger: Squash some (wrong) transition warnings on QmlEngine shutdown
Change-Id: I70d735d45012944b55476214c88a27abfd97612a
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-11-08 13:00:54 +00:00
hjk
dfbdc1e543 Debugger: Remove public access to QmlCppEngine::m_qmlEngine
Not used anymore.

Change-Id: I30605916bcdb4e5231d86ddc371f2d41e3d9d526
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-11-08 12:59:14 +00:00
Tomasz Olszak
60d34f25b5 ScxmlEditor: label data item in structure model by using "id"
Currently structure "modeldata" contains numerous "data" elements.
It is hard to edit because one need to click on data element to check what's
the element "id" which corresponds to variable name in e.g. when model type
is ecmastript.

Change-Id: I47687627a71a46c21f172d4dc50df2c9b9359edd
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2017-11-08 12:35:30 +00:00
Eike Ziller
2baf163044 UpdateInfo: Fix crash on close while searching for updates
The ShellCommand deletes itself if run asynchronously, and it also
cancels itself when ICore sends coreAboutToClose, so we must be prepared
for it to vanish at any time.

Task-number: QTCREATORBUG-19165
Change-Id: I6d6a737ea529012976a623f812f2c426518557fd
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-11-08 11:11:02 +00:00
Christian Stenger
1305068375 Test: Fix typo
Change-Id: I0e7ca842f550cbb0853221c9b843192c2675bc73
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-11-08 10:48:25 +00:00
Ulf Hermann
9fef8ff319 Android: Add support for QML preview
Change-Id: Ib1dc4f21686c14abf15e8a8bda82bff34ec019b4
Reviewed-by: hjk <hjk@qt.io>
2017-11-08 09:11:45 +00:00
scootergrisen
c13a559aff Update danish (da) translation for Qt Creator 4.5
Change-Id: I6538cd7edbc9a52acc51d04f5d3f5628a9d9e7dd
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-11-08 09:02:20 +00:00
hjk
3888e9c817 Debugger: Fix some state transition warnings
Effective functionality is unchanged, this only avoids warnings
about InferiorSetupRequested -> InferiorSetupRequested transitions
in the slave engine.

Change-Id: I727a271e105df69d18232854a7828960f40c0574
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-11-08 08:51:15 +00:00
Eike Ziller
14abd38fde Fix build
Broke with f4c3e9d638

Change-Id: I0ea5e4b1a092f92172fe4c9194117ab23473033e
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-11-07 16:54:47 +00:00
Christian Kandeler
9e0a15f2b7 Update qbs submodule
To HEAD of 1.10 branch.

Change-Id: Ic24c3ac710ec113dbcdf1392fbe36b52019b8813
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2017-11-07 16:45:58 +00:00
Tobias Hunger
f4c3e9d638 NewDialog: Use nullptr
Change-Id: Iae9bd28a39a7fa77f2819a62870b2ce55011ca1e
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-11-07 15:07:50 +00:00
Tobias Hunger
be1d9beece TargetSetupPage: Use nullptr
Change-Id: I41d996ffe2574f379f50a6867fe541ed235d5e81
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-11-07 15:07:39 +00:00
Tobias Hunger
4258586d80 ProjectExplorer: QTC_ASSERT that kit * is not-nullptr
Change-Id: Icb251442acc33c7904174055e8ce733d47bb4047
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-11-07 15:07:32 +00:00
David Schulz
e6b7d35bb0 Debugger: Fix enum dumper for cdb and lldb
Change-Id: Ieea120c00553ebe88c2daca0756a1eadba5991a3
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-11-07 14:55:13 +00:00
Thomas Hartmann
e350997bcd QmlDesigner: Remove frames for deleted ModelNode
If a ModelNode is deleted we have to delete all related
frames.

Change-Id: I93f13f6a81c65d5cd858276baf754fd5a78d7b45
Reviewed-by: Knud Dollereder <knud.dollereder@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-11-07 14:39:53 +00:00
Thomas Hartmann
b94068c336 QmlDesigner: Add convenience function
Change-Id: Icb6c095d915499450c9c019adcab91fcae7fc851
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-11-07 14:39:44 +00:00
Tim Jenssen
256c707471 QmlDesigner: remove unused include
Change-Id: I74bec37b72e8b3687aa0fa1acc01a377ec06f60e
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-11-07 14:31:33 +00:00
Eike Ziller
a9e4e3608e Merge remote-tracking branch 'origin/4.5'
Change-Id: I0194bdeda71e33fd5bc9cb3eb7a9198ae72815ed
2017-11-07 15:10:36 +01:00
hjk
83ff62aa13 Debugger: Synchronize slave engine inferior setup phases again
This reverts most of 4977c915 and applies the same pattern for
setupEngine. Turns out that the removal was premature due
to the special needs of Android setup.

Task-number: QTCREATORBUG-19199
Change-Id: I4e2ff4f34a842f3296999a0651e7e8fd6470198c
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-11-07 13:42:59 +00:00
David Schulz
ae40f434e8 Debugger: Instruct the user to pick a debugger setting
When neither c++ nor qml debugging is enabled in the run page the
debugger wont start. Print a message to the Application Output pane
describing where the setting is located that enables debugging.

Change-Id: I580139e62c0fb0f4ae518ce818738165b80f8e0c
Reviewed-by: hjk <hjk@qt.io>
2017-11-07 13:08:42 +00:00
Eike Ziller
8eae8881cc Improve horizontal scrolling in the navigation views
Because of QTBUG-3927 the tree views are scrolled completely to the left
when selecting any item because it makes the header column visible. That
is very annoying, because it makes items deep in the hierarchy hardly
readable, even if you manually scrolled horizontally to see them.
Scroll horizontally to make the actual item visible instead.

Task-number: QTCREATORBUG-19204
Change-Id: Ic083236feae8892d210b9d2b1238f3c6b80a8cea
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-11-07 12:16:04 +00:00
Ulf Hermann
8515fd13e3 Debugger: Remove unused lambda capture
Change-Id: I7e0b87003f320e35dd28aa8ebd83766929ef1565
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-11-07 11:52:15 +00:00
Ulf Hermann
389ca50865 DiffEditor: Add missing override
Change-Id: Ic0541a8c902ae10c622cf8843990bdc4e21b9fe8
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-11-07 11:47:00 +00:00
Eike Ziller
489ec3594a NavigationTreeView: Add overrides
Change-Id: Ia31c56b26fd62345338b9a613499fb7b9504df48
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-11-07 10:55:07 +00:00
Tobias Hunger
54e2a977b9 ProjectExplorer: Code cleanups for AbiWidget
Change-Id: I501d7a30413ea13c5ba7f6d8e3b990f615629b5e
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-11-07 09:57:23 +00:00
Tobias Hunger
9ca74997d5 CMake: Use QtOutputFormatter for CMakeRunConfigurations
Use QtOutputFormatter for CMake run configurations that belong to targets
with Qt configured.

Task-number: QTCREATORBUG-18586
Change-Id: Iedb6d7079649022b2ba6dabef37b79c0d33b8635
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-11-07 09:51:22 +00:00
Christian Stenger
d0fe839451 DumperTest: Fix compile failure for gcc4.9
Change-Id: I1d97324a12a4d0974f1930351f337c381851d011
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-11-07 09:45:41 +00:00
Leena Miettinen
072e8c323b Doc: Update Accelerate Bubble example to use the Swipe wizard
Change-Id: I6f3d88788707c4ecd18c327c9145529ec0bd8fc6
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-11-07 09:33:18 +00:00
Leena Miettinen
a1a47242c6 Doc: Update the Transitions example to use the Swipe wizard
Change-Id: I17e6d8ddba96d28ea8f533d5993f8665fd380ca0
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-11-07 09:31:21 +00:00
Leena Miettinen
7cf755bc06 Doc: Update info about Qt Quick Application project wizards
There are now wizards for creating apps that use Qt Quick 2
types or Qt Quick 2 controls (ScrollView, StackView, or SwipeView).
Some wizards generate ui.qml pages, while others don't. Therefore,
an include file can no longer be shared between the tutorials and
the creating projects topic.

Change-Id: If06e20511cb5f6fe9da28feff40cec0250a49416
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-11-07 09:26:12 +00:00
Ulf Hermann
636efd668f QmlJS: Declare a metatype for the Dialect enum
This way we can pass it through signals across threads.

Change-Id: I6753233204d9210d181633e16f1d5bff967d55c9
Reviewed-by: Marco Benelli <marco.benelli@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2017-11-07 08:47:39 +00:00
Leena Miettinen
40fa1d594a Doc: Remove remaining reference to deploying incomplete APKs to Android
... and update the screenshot.

Change-Id: I9c93b0c94bec6c3f685160dd2fd0e73e33044b5c
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2017-11-07 08:16:40 +00:00
Thomas Hartmann
05d969a61b QmlDesigner: Move HelperWidgets
Having the HelperWidgets next to the QtQuick directory was triggering
a bug in Qt (QTBUG-64237).

The property editor was white with Qt 5.10, because the "." import is
mapped to "./QtQuick" and was confused with QtQuick 2.x.

Task-number: QTCREATORBUG-19194
Change-Id: I4148d8e40f1e886eb41ffe6f4df62b213af5e9c3
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-11-06 18:02:02 +00:00
Tim Jenssen
de87562eb3 QmlDesigner: Fix crash in QGraphicScene
Use QWidget method to block updates instead of an own implementation.
The QWidget grab resulted in crashes like in QTBUG-36600.

Change-Id: I4b57a0ba19e3a85e8e7985f893074364f5cb4490
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2017-11-06 17:22:55 +00:00
Thomas Hartmann
6a738504d0 QmlJS: Add error message for dynamic property called "data"
The default property of most QtQuick items is data and
therefore "data" should not be used as a property name.

Task-number: QTCREATORBUG-19225
Change-Id: I54d1b72ce984debd4c366b7261e93b7a81b8c940
Reviewed-by: Marco Benelli <marco.benelli@qt.io>
2017-11-06 16:41:07 +00:00
Tobias Hunger
438fe38e1f ProjectExplorer: Fix logging category prefix
Use the same qtc.projectexplorer. prefix for the gcc toolchains logging
category that is already used elsewhere in the ProjectExplorer plugin.

Change-Id: I5f2746504ed08d5422baaedd6860fa1ed3c86bae
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-11-06 16:05:56 +00:00
Thomas Hartmann
dc82eabe4c QmlDesigner: Fix crash
In case the dynamic property was called "data" the designer
crashed.
There are still issues with dynamic properties called "data",
but it does not crash anymore.

Task-number: QTCREATORBUG-19224
Change-Id: I824a40729ed104f4eaa6a2bdc2fda336aafab836
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-11-06 15:18:44 +00:00
hjk
78513ecd8f Debugger: Split Expressions view into dock of its own
Change-Id: Ie86a5bd72c3140219f925835a065d9f6a3ae0ea4
Task-number: QTCREATORBUG-19167
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-11-06 11:53:57 +00:00