Commit Graph

5724 Commits

Author SHA1 Message Date
Christian Kandeler
019447c535 New class wizard: Add Qt module dependencies, if necessary
Provide general infrastrucure and implementation for qmake.

Fixes: QTCREATORBUG-16067
Change-Id: I8c6368fe2724c9450dcbc3410b6ca459bbbdc043
Reviewed-by: hjk <hjk@qt.io>
2019-06-19 14:06:49 +00:00
Thomas Hartmann
9da6c2f43b QmlDesigner: Add alias export to QtObject
Change-Id: If1a78463d4f1625105ab1fad7e179e645be08c9e
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-06-19 07:19:15 +00:00
Thomas Hartmann
1dae4593cc QmlDesigner: Use MenuItem instead of Action
This avoids conflicts with shortcuts.

Task-number: QDS-803
Change-Id: I9269729cf2cb4a6bba9493d768c595748af3392d
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2019-06-19 07:18:42 +00:00
hjk
93d2e3352c Debugger: Improve QObject dumper
Don't use two lookups for parent types and act on known null pointers.

While the machinery is robust enough to handle the result it's a
needless deviation in regular code path.

Change-Id: I6e50629cf554870a3ffb9f488f654e6ae557e5b3
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-06-18 09:55:07 +00:00
Thomas Hartmann
0bcdc93e19 QmlDesigner: Fix layout in templates
Because the templates did not use the pre-defined layout,
the layout was bit broken.

Change-Id: I3a11e78a8dd6ac81252fa51270de5d427e5de0c2
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2019-06-12 15:19:33 +00:00
Thomas Hartmann
da3f9eb5bf QmlDesigner: Fix property editor template for colors
The color editor requires its own section.
Therefore we mark the color type with 'separateSection'.
For this to work we have to order all properties.
The properties that require their own section do come first.
The QML code generation became a bit more complicated, but
having proper default sheets for colors should be worth it.

Task-number: QDS-742
Change-Id: I1eee71aa05c66af4aaf53e0e8c5a3514a9ca6d92
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2019-06-12 15:19:10 +00:00
Thomas Hartmann
aa30828f40 QmlDesigner: Disable horizontal scrollbar for property editor
Change-Id: Id6b9dc66ca86f775c7d8fd8a5c847becb5cf96cb
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2019-06-12 15:18:37 +00:00
Thomas Hartmann
2831f601fa QmlDesigner: Use OpenGL 4.1 surface for puppet
Change-Id: I520adbb54fc264e738ca5eb630f5cc7bc80ee4bd
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2019-06-12 13:48:56 +00:00
Cristian Adam
36135aa261 CMake: Small clean-up of CMake Wizards
* Updated CMake minimum version to 3.5 (Ubuntu LTS 16.04)
* Lowercase commands
* Used the target name instead of ${PROJECT_NAME}, which nobody uses in practice
* No string quotes around the source filenames, which do not contain spaces

Change-Id: Ide9b3eb85535213798c6c35e08624cae080ebd9d
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2019-06-12 13:34:58 +00:00
Thomas Hartmann
b94c725f0f QmlDesigner: Reserve less space for label
We currently waste too much space for long label.
Eliding works fine for long property names.

Change-Id: I1fe2836e8c06cff93e2a48c6290265ab300e5321
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2019-06-12 11:30:20 +00:00
Thomas Hartmann
f6db77a0cc QmlDesigner: Slightly reduce size of the spin box
Change-Id: Ida09ddf17fcdc7000b03c6020334e30cfa7c74ee
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2019-06-12 11:30:02 +00:00
Christian Kandeler
a093dfc65c Wizards: Include namespace in header guards again
This was broken in 63c339ffba while trying to fix a different bug.

Fixes: QTCREATORBUG-18157
Change-Id: Iec7e14de257195ed9bb20314b8031d3ef59df2ae
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-06-12 11:05:12 +00:00
Henning Gruendl
3172773f52 QmlDesigner: Add more studio controls
* Add alignment button rows with new controls
 * Add font style buttons with new controls
 * Add anchor button rows with new controls
 * Fix CheckBox error about undefined assignment
 * Add new colors in ColorLogic
 * Fix low contrast for edit mode text color ComboBox, SpinBox, LineEdit
 * Add new icon font
 * Fix TranslationIcon background color
 * Some minor import refactoring

Change-Id: If014c3351fd33ccaf893a31033c893e13ee04821
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-06-12 09:15:51 +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
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
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
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