Commit Graph

59601 Commits

Author SHA1 Message Date
hjk
504e0140bb ProjectExplorer: Let the KitChooser optionally show icons
There are cases in the debugger where it's more convenient
or with the current state of Abi matching even needed to
use non-matching kits. Still, visual hints are helpful.

Change-Id: I66ca89cbd1664f43864873e3b4d81a9c8e1b36fa
Reviewed-by: David Schulz <david.schulz@qt.io>
2019-06-12 05:51:34 +00:00
Eike Ziller
9d39e68173 Merge remote-tracking branch 'origin/4.9' into 4.10
Change-Id: I7725557a279cc13fe03a72c20accf63b50571608
2019-06-12 07:21:15 +02:00
hjk
c978afb42e Debugger: Use the new hint to determine why settings should be saved
Change-Id: I5f8e2caceaa9769fc99e91bf1e29470fa17320bb
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-06-11 15:56:20 +00:00
Uladzislau Paulovich
70fecd518e qml | Fix functions and loops formatting
Bugs fixed in this change:

1. Incorrect function arguments formatting:
function(a, b, c) -> function(abc)
2. Incorrect foreach loop formatting:
for (var a in b) -> for (a in b)
3. Incorrect for loop formatting:
for (var a = 1; a < 100; ++a) -> for(; a < 100; ++a)

Change-Id: I8afef6e5f2485a2225931b7ecb7210506e06dc6c
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2019-06-11 15:23:42 +00:00
Uladzislau Paulovich
8f7cbd6416 qml | Fix trailing comments formatting
Change-Id: I0461c4616cff15b7010e3844850d32e9f07469ea
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2019-06-11 15:23:17 +00:00
Uladzislau Paulovich
8dc16d55c2 qml | Fix empty objects formatting
Change-Id: I760f3420fef9ca83c2a28586575a72d580658d0f
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2019-06-11 15:22:36 +00:00
Cristian Adam
be967e1cd9 CMake build: Add qmlpreviewplugin
Change-Id: I43283f393dead6098b6a2309a69338f78fb01b80
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-06-11 14:56:48 +00:00
Eike Ziller
25ecadcaf3 Add changes file for 4.10
Change-Id: Idc8dd41e3f70326043b32d920122702bd4ccaa61
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2019-06-11 14:31:46 +00:00
Christian Kandeler
df6bbdd191 Output panes: Fix filtering newly added content
For output panes without a formatter, filtering was only applied to the
content that was already there. Newly added content was always shown,
regardless of whether it matched or not.

Change-Id: I63424a95c0ff4747ef804b62ebde2253782c8a39
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: hjk <hjk@qt.io>
2019-06-11 12:02:55 +00:00
Christian Kandeler
32afe83108 SSH: Fix autotest
- Consider the case of connection sharing being disabled.
- Adapt to slower environments.

Change-Id: I088622034c26ea343eb78161b24c43b3286b0512
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-06-11 12:02:17 +00:00
Marco Bubke
4d3bb1c858 ClangFormat: Provide an error message for Clang Format
If an patch is not applied to libFormat in Clang we do nothing. It would
be better to provide feedback if the plugin is loaded.

Change-Id: Iea9900cf7683b521497cc6403638498a9ca5e2e9
Fixes: QTCREATORBUG-22404
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2019-06-11 11:25:21 +00:00
Nikolai Kosjar
e32fcbfbd1 CppTools: Add logging to built-in indexer
This might help to identify problematic files.

Change-Id: I76848e6ca12a654c8426cf0d73b50612273d48c3
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2019-06-11 10:56:17 +00:00
Uladzislau Paulovich
ab87bdf4ea qml | Add support for enums formatting
Change-Id: Id7e435a7c556c7fc469b9055ca772a7850e16676
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-06-11 10:04:29 +00:00
Uladzislau Paulovich
69cd74f25d qml | Fix let/const variables formatting
Change-Id: Ia2a4ee482e84a6c24abea7ea6fe05925eee11d1d
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-06-11 10:03:57 +00:00
hjk
5f26fe6298 Debugger: Robustify DebuggerRunTool::showMessage()
Seems to be possible to trigger in a failing MinGW start on Windows.

Change-Id: Ica93c29ad677c24688a8cf2c5a0f1018471ffe51
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-06-11 08:01:46 +00:00
Leena Miettinen
518f49fb8d Doc: Describe parsing existing compile output
Task-number: QTCREATORBUG-16017
Change-Id: Ic2fba193a98d191570c226478b58b5443b1fdedf
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-06-07 14:50:12 +00:00
Thomas Hartmann
c839830b3e QmlDesigner: Fix delete shortcut
QtQuick Controls 2 seem to define all shortcuts globally.

Task-number: QDS-803
Change-Id: I6d29f659261c12bdd66473e2c680044b486891ec
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-06-07 14:42:27 +00:00
Thomas Hartmann
6f8f149761 QmlDesigner: Reload property page on start
This is requires to work around QTBUG-75847.

Change-Id: Ib95fed12cc332e4d231d5bfee3c20dff5f2f19c3
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2019-06-07 14:42:10 +00:00
Aleksei German
469647db3d QmlDesigner ColorPalette StudioControls usage
Change-Id: Ia1c2daa693e9c2c2a2808cf6fab65a2b60014456
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-06-07 14:42:00 +00:00
Aleksei German
f3c2fcef1a QmlDesigner ColorButton Labels replacement
Change-Id: I2b0af3e1f77fda44d738202986071b9c8f50cb4f
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-06-07 14:41:38 +00:00
Henning Gruendl
6d55273fd9 QmlDesigner: Fix design studio crash
Change-Id: Id88dbbf7a8526e1d616c4ca31d56863103713f1d
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-06-07 14:41:24 +00:00
Aleksei German
11093f1ed7 QmlDesigner ColorEditor Labels replacement
Change-Id: Ic437540c8f5047f303b627dd9579e8eead3791e1
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-06-07 14:41:09 +00:00
Christian Kandeler
5636686aa0 Fix warnings in qbs build on macOS
Amends fc04ec1c3e.

Change-Id: I17f41ad1dc02727da8431b55cb3b14d4594fe1af
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2019-06-07 13:15:42 +00:00
Leena Miettinen
9ea159ca22 Doc: Describe cleaning up the compiler list in Kit options
Change-Id: I98769d60df90bb548d1432598f37f2a9bf347053
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-06-07 12:39:18 +00:00
Henning Gruendl
20b1941aed QmlDesigner: Fix studio controls
* Fix CheckBox hover and focus behavior
 * Fix CheckBox long label issue
 * Refactor SpinBox wrapper property
 * Fix SpinBoxIndicator active focus on use
 * Refactor edit state in all controls

Change-Id: Ice12aac7b97a36a658dadfac68457aefe0d757a1
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-06-07 11:57:01 +00:00
Thomas Hartmann
52f718fdcb QmlDesigner: Some layout adjustments
Change-Id: Ibf752ff24c1e79629a49061abeb7f87136a7a316
Reviewed-by: Aleksei German <aleksei.german@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-06-07 11:54:38 +00:00
Thomas Hartmann
d74e68bc3c QmlDesigner: Fix soft assert
The node can acutally be invalid.

Change-Id: I18430a538ce947c724ddca85e9fc5e40175019d4
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
2019-06-07 11:54:27 +00:00
Christian Stenger
44a282396f Tests: Fix build with MSVC 2017
Change-Id: I252ec40b026719f6cd5446b61b63dfdbd20e8ae9
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-06-07 10:35:52 +00:00
Christian Stenger
679b31f841 AutoTest: Add support for templated boost tests
Change-Id: I393d20f186a47d7d1d18775a8f1102890c9de9f4
Reviewed-by: David Schulz <david.schulz@qt.io>
2019-06-07 06:41:15 +00:00
Christian Stenger
c20824f5ff AutoTest: Support data-driven test with fixture
Boost has a special macro to indicate a data-driven test
with support for a fixture class. Find and handle these
test cases as well.

Change-Id: I9f3d22b7b2df35edfdf0a017da3005f67ade017f
Reviewed-by: David Schulz <david.schulz@qt.io>
2019-06-07 06:41:03 +00:00
Christian Stenger
c23fe4f403 AutoTest: Remove wrong todos
These todos have been resolved already or turned out
to be wrong / not necessary.

Change-Id: Iefa46bd8144834a60fbb9d523ac73d3372d4a6b6
Reviewed-by: David Schulz <david.schulz@qt.io>
2019-06-07 06:40:52 +00:00
Christian Stenger
6b124b580e AutoTest: Add support for decorator fixture
Boost tests and suites can have the fixture decorator.
Detect this and reflect it on the test tree view.

Change-Id: I16e0ddefcdc433647aa41810040d9d7cd0c4bf2d
Reviewed-by: David Schulz <david.schulz@qt.io>
2019-06-07 06:40:39 +00:00
Christian Stenger
77902649a8 AutoTest: Use reporting summary from Boost UTF
Handle all combinations of LogFormat and ReportFormat
correctly and be able to summarize the test result
correctly by reporting the correct number of Passes,
Fails and Skips.

Change-Id: I47e6fefa2bb2cbb7a25f2ed474a3bb2da1e1e769
Reviewed-by: David Schulz <david.schulz@qt.io>
2019-06-07 06:40:11 +00:00
Christian Stenger
12038dd012 AutoTest: Enhance reporting passes and fails
Depending on the report and log level of Boost UTF
the number of test passes and fails might be wrong.
Circumvent by providing a way to report a summary.

Change-Id: I6d2cb7674550f10a0263e08d21cce42569f3d7a8
Reviewed-by: David Schulz <david.schulz@qt.io>
2019-06-07 06:39:52 +00:00
David Schulz
6fd355b84b TextEditor: force rehighlight of next block if state changed
If the user state of a block changes while it gets highlighted
the next block will be rehighlighted too. Currently we store the
indentation depth in the block user state. So in order to store the
indentation depth _and_ the information whether the next block needs
to be rehighlighted we bit shift the indentation depth via the
brace depth helper functions from TextDocumentLayaout. And we cannot
store the struct KSyntaxHighlighting::State in the block user state (int)
directly to indicate that the next block also needs a rehighlight so we
toggle just the last bit of the user state.

Fixes: QTCREATORBUG-22290
Change-Id: I632f4416a725dc5fa1667bcab34fb2701294c9b8
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-06-07 05:20:36 +00:00
Thomas Hartmann
7459afaf3c QmlDesigner: Remove print
Change-Id: Iadf0a1343974eb034ecca1e5b64b90b4a525849f
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-06-06 15:56:57 +00:00
Thomas Hartmann
641cc7ee06 QmlDesigner: Use new controls in TargetComboBox
Change-Id: I8f65e673843c119de1f910b7e2c4d35fccfd8a94
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-06-06 15:56:33 +00:00
Thomas Hartmann
cd42ebb840 QmlDesigner: Use new controls in UrlChooser
Change-Id: I07e6110f4e2d2c7458860db0432fb58afacf7015
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-06-06 15:56:21 +00:00
Thomas Hartmann
9f0a0cd8c6 QmlDesigner: Add wrapper pattern to DoubleSpinBox
This is unfortunately required for step size.
We need real in the API while QQC2 has int.

Change-Id: I162c13a3edc24c34271a1dbf8e19f55b9fe2d034
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-06-06 15:27:00 +00:00
Thomas Hartmann
6b82dd201f QmlDesigner: Fix QML warning
Change-Id: Ic5fae60c8efb9009c310d558f3dc9629822a40f7
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-06-06 14:01:47 +00:00
Thomas Hartmann
fed8f7745c QmlDesigner: Fix hasSlider: in SpinBox
This property exists for compatibility reasons.

Change-Id: I25a4454da953f0b7165e1ef5aeeba28e9ab1087a
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-06-06 14:01:30 +00:00
Thomas Hartmann
422553ca2f QmlDesigner: Add ExtendedFunctionLogic to qmldir
Change-Id: I6888ecba5994f42a6f7c3d0b878b4c26a6cf35d0
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-06-06 13:08:59 +00:00
Thomas Hartmann
1435d43f20 QmlDesigner: Add sliderIndicatorVisible to SpinBox
Change-Id: I6a136b537a755a63350514ce2e2d5d42f93c503b
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-06-06 13:08:47 +00:00
Thomas Hartmann
68a6c5dfd9 QmlDesigner: Use sliderIndicatorVisible for some properties
Change-Id: I5827bd15c42f65f23f8b47a0f110c37311d26631
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-06-06 13:08:29 +00:00
Thomas Hartmann
98f6c55653 QmlDesigner: Set proper closePolicy for Menu
This is required for macOS.

Change-Id: Ib0631583104a46a3828529ac4a64adbe7cbfd774
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-06-06 13:08:10 +00:00
Thomas Hartmann
b6703b989d QmlDesigner: Remove focus when clicking outside
Change-Id: I400401c547461cfca22f7af026cf9c33704e8f6a
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-06-06 13:07:57 +00:00
Thomas Hartmann
4edfa4c740 QmlDesigner: Use new controls for FontComboBox
Change-Id: I72946b4adb8e160c05191da0c96011881cd09543
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-06-06 13:07:43 +00:00
Thomas Hartmann
726c51eb8c QmlDesigner: Use onCompressedValueModified
Change-Id: I7ebe5a8db4b78ac086d0301f6d6d84fb99c83cda
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-06-06 13:05:37 +00:00
Thomas Hartmann
d9b8213856 QmlDesigner: Use new controls for font section
Change-Id: I53041a989f71f990c6051b87d84631c3e94a0f34
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-06-06 13:05:17 +00:00
Thomas Hartmann
fc711ed66f QmlDesigner: Implement DoubleSpinBox with new controls
Change-Id: Icf42b8633df2f9b35bafe92a3fde4cdbb03cbf72
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-06-06 12:58:40 +00:00