Commit Graph

7857 Commits

Author SHA1 Message Date
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
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
Thomas Hartmann
14ede3af6f QmlDesigner: Use new controls for GradientPropertySpinBox
Change-Id: I30175e89f375cd6dc56a255d195c1788aa873577
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-06-06 12:58:25 +00:00
Thomas Hartmann
52ddea91ee QmlDesigner: Add missing properties to LineEdit and ComboBox
Change-Id: I7e9a9159aa75973f04a660a16c2d00aa294ab944
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-06-06 12:57:47 +00:00
Thomas Hartmann
e5dde74b9f QmlDesigner: Work around layout issue
Layout.fillWidth: true does not work without an explicit size.

Change-Id: I4308016febddef1735d6e5261ac5bc989496bac9
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2019-06-06 12:56:23 +00:00
Thomas Hartmann
337e8c71c8 QmlDesigner: Add more space
Change-Id: I56c13be32d9dcb4fca43cd6577b2b06ffd71eaf8
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-06-05 16:08:16 +00:00
Thomas Hartmann
5344d41689 QmlDesigner: Some cleanup
Change-Id: I58bbfab2ba0c1054ba4f36603f54b1a8b8572132
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-06-05 16:07:45 +00:00
Thomas Hartmann
029884c80e QmlDesigner: Use studio controls for property editor
* CheckBox
 * ComboBox
 * LineEdit

Adjusting some details in property editor.

Change-Id: I8f9d6ef87c187f5a3be7c5fb368a1813e6dba92c
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-06-05 14:58:54 +00:00
Henning Gruendl
a18d3d1f9a QmlDesigner: Add ExtendedFunctionLogic
Also a couple of smaller fixes on MenuItem and some changes in
ActionIndicator alias properties.

Change-Id: Ib8e30074f0c2934925ab3958afa106a904a0ecdd
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-06-05 14:51:14 +00:00
Henning Gruendl
22be712f47 QmlDesigner: Add new controls for property editor
Adds new controls for the property editor based on Controls 2.

Change-Id: Ice54ead5d774a7ce54282e442cb26cb970a4be1b
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-06-05 14:47:03 +00:00
Aleksei German
1927813ab1 QtDesignStudio Color Editor update
Palettes, Favorite colors, Recent colors, changed layout.

Change-Id: I6fca962923a3e7a230edebdab5a30bd0847c8ba9
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-06-05 14:41:19 +00:00
Thomas Hartmann
218c1e3769 QmlDesigner: Add multi-selection to property editor
This implements basic multi selection for the property editor.
The property editor shows the most common type.
Values in the property editor show the values of the item that
was selected first.

Task-number: QDS-324
Change-Id: I5f03fa5aa9cfb0a0abaf285a29bf5f7e931635e5
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2019-06-05 13:27:48 +00:00
Tobias Hunger
d0427fc068 CMake: Add a custom target to copy share/qtcreator into build folder
Change-Id: Iae78b8a154c80f26f08d5512c089f7eb802d3662
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-06-03 13:42:50 +00:00
Christian Stenger
884665a0fe Wizards: Fix CppLibrary wizards
Fix wrong string evaluation of boolean values which made
in turn the generated files partially wrong.
Introduced with cb63706f83 (but wrong also before for
the no-Qt-dependency case).

Change-Id: I404534d4b21d0d1c496635adfcd8a73716ba13d3
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-06-03 11:08:37 +00:00
Eike Ziller
23c222f61b Fix C++ Library wizard when compiled with Qt < 5.12
Only Qt 5.12 got true ECMA Script capabilities, so arrow function
expressions are not supported before that.

To be able to use "regular" inline functions, we allow usage of } by escaping with backslash.
For variables that do not start with "JS:" we already supported backslash for escaping.

Fixes: QTCREATORBUG-22336
Change-Id: I9fc638e64d2757a21fffc16355635e2fcff87a36
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-06-03 06:46:52 +00:00
Eike Ziller
4704f49fbb Merge remote-tracking branch 'origin/4.9'
Conflicts:
	src/plugins/cmakeprojectmanager/cmakebuildsettingswidget.cpp
	src/plugins/qmldesigner/qmldesignerextension/timelineeditor/preseteditor.cpp
	src/plugins/qmldesigner/qmldesignerextension/timelineeditor/timelinesettingsmodel.cpp
	src/shared/qbs

Change-Id: I369368de9b9c682b03e224d489589043e1f6782b
2019-05-28 14:01:01 +02:00
hjk
92a52a7181 Use Qt's QFileInfoList instead of QList<QFileInfo>
Helps to adapt to potential upstream changes in Qt 6

Change-Id: Ie154bd4fd513d46cb0493758be8943fc4581d71c
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-05-28 07:19:45 +00:00
Tobias Hunger
47f8fb0600 Translations: Fix generation of directory list to translate
Change-Id: Ib010fa74495a98eddce333d74e447bca9db34afc
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-05-27 12:12:23 +00:00
Christian Stenger
84b34a41e7 Wizard: Make the default generated template runnable
If one uses the Python - Window template and does not explicitly
change the custom base class to an existing the generated project
lacks some essential stuff.
Make the generated main file usable even for first time users.

Change-Id: I898189fd4edff88f13987d6d1df9f77e2ef6bd68
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
2019-05-27 11:35:37 +00:00
Orgad Shaneh
1e138fbe10 Remove excess blank lines after namespace
Change-Id: I4e4f83017f2bfc2cf842c4c971ed4b05e0447e6a
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-05-27 06:50:16 +00:00
Christian Stenger
675ac662e9 Wizard: Fix AutoTest wizard for Boost with CMake
While at it use the same environment variable used for
Qmake or Qbs based project.

Change-Id: Ieefb4e1da4ce4155863b80a1b275b67e664273c6
Reviewed-by: David Schulz <david.schulz@qt.io>
2019-05-24 06:58:41 +00:00
hjk
7418c4f1ee Debugger: Adapt to new qt_v4StackTraceFromEngine helper function
Change-Id: I3d3dbd837e1b73117524e286ae4ea09e652e4a5c
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2019-05-24 06:45:08 +00:00
Christian Stenger
5c6eb0a2ba AutoTest: Further adaption following official terms
GoogleTest started using the term Test Suite for grouping
related tests and Test Case for general tests.
This patch adapts the visual strings as well as some
internal API which used the same terms.
This completes 6189745a3b.

Change-Id: I0307c10b8b5f8574f31a68ee4320732f3e829532
Reviewed-by: David Schulz <david.schulz@qt.io>
2019-05-24 06:24:44 +00:00
Tobias Hunger
73b5cede73 Translations: Remove translation for Qt Quick wizards
These wizards no longer exist.

Change-Id: I053a90eb9d61df6d6e6f11311d460e10c4f39c1c
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-05-23 13:14:22 +00:00
Tobias Hunger
6352e3c27d Translations: Remove translations for qml wizards
We have no such wizards anymore.

Change-Id: I220ae873d4cb3694a843dfcf4035f167628ac542
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-05-23 13:14:12 +00:00
Tobias Hunger
3051fd2b2d Translations: Do not translate *.mimetypes.xml files
There are no such files anymore.

Change-Id: I9e5a744f3cb5d5bc8000fc5c8da202302fff50d8
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-05-23 13:14:00 +00:00
Christian Stenger
a0b94384a6 AutoTest: Add wizard for Boost test
Task-number: QTCREATORBUG-21169
Change-Id: I77936e3e47911cf724705c858b9897c74875c41e
Reviewed-by: David Schulz <david.schulz@qt.io>
2019-05-23 12:19:36 +00:00
Christian Kandeler
068dbd3aef Wizards: Take Qt virtual keyboard setting into account
... in the project files.

Fixes: QTCREATORBUG-22446
Change-Id: I39f8d6be17ac9fb8f41dd91851578e34c249bfe3
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2019-05-21 14:40:52 +00:00
Thomas Hartmann
bd2aa8ada3 QmlDesigner: Fix issue with gradient editing
The gradient only has to be deleted if we are in gradient editing mode.
If we are not in gradient editing mode, we should not delete any gradient.

This was creating issues when editing border.color.

Task-number: QDS-675
Change-Id: Ie3fcbc4a817cb0062e895298d42794b7338084d6
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2019-05-21 11:49:49 +00:00
Antonio Di Monaco
9d148276a3 Debugger: Do not make std::vector layout assumptions
... when non-std allocator is used.

This patch is a follow-up of 41da97fb2c.

Task-number: QTCREATORBUG-22040
Change-Id: Ib3e7699ccb77fd2c934d28367629d78dbf5379d8
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2019-05-21 09:37:56 +00:00
Thomas Hartmann
ce9a059388 QmlDesigner: Add missing else statement to color editor
Task-number: QDS-685
Change-Id: Id941aaa19cb727e020ca1021a452aba32ba493ee
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
2019-05-20 12:10:34 +00:00
Cristian Adam
d855b84c5d Qt Creator CMake port
Based on Tobias Hunger's work from a few months ago.

The CMake configuration needs libclang and Qt paths specified as
CMAKE_PREFIX_PATH.

Auto tests are run with "ctest". At the moment the pass rate is 87%.

Change-Id: Iba98e39bf22077d52706dce6c85986be67a6eab0
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-05-17 13:33:28 +00:00
Eike Ziller
0565457b5c Merge "Merge remote-tracking branch 'origin/4.9'" 2019-05-17 11:50:45 +00:00
Eike Ziller
829a08047f Merge remote-tracking branch 'origin/4.9'
Conflicts:
	src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp

Change-Id: I473084232ab99c18e2316154656de0035af02628
2019-05-17 12:47:24 +02:00
hjk
cffc09e53d Debugger: Disable a few more Creator-specific dumpers
... that were not updated when the structures changed.

Change-Id: I1c06ac029f2057d618ce21b5da3edf9694cff63d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-05-17 10:34:30 +00:00