Commit Graph

7806 Commits

Author SHA1 Message Date
Christian Kandeler
6530a4fdc7 Fix some compiler warnings
Change-Id: I4eaf47bda086b83618f461ab19d1715c67e27ae1
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-08-09 11:52:07 +00:00
Thomas Hartmann
fa1d7958c3 QmlDesigner: Do not generate version number if invalid
This is a fallback to create components from source.
If the majorVersion is negative we should not generate
a version as part of the import.

Change-Id: I377b241e8e4c51141d560d7198e5906a9c963b54
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2021-08-09 08:10:01 +00:00
Miikka Heikkinen
7211b7abf2 QmlPuppet: Fix crash on active scene change
Active scene change involves deleting and recreating the View3D
instance of the 3D editor that imports the actual shown scene.
In Qt 5 it was necessary to mark the deleted View3D instance as having
no content, so it wouldn't receive any more updates. This hack no
longer appears to be necessary and causes this crash instead, so it
was removed.

Fixes: QDS-4786
Change-Id: I848ac78dc2f951ba7e1bf4d3d6aa4244b1443309
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2021-08-06 13:43:27 +00:00
hjk
adf70fd8f2 Debugger: Don't add empty path components to solib-search-path
Change-Id: I417e5193749dae44d189fc0189a92899d738976b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-08-06 07:18:43 +00:00
Henning Gruendl
c116b25709 QmlDesigner: Add collapse/expand all to sections
Add the functionality to collapse/expand all section in the property at
once by calling a context menu on one of the section headers and
choosing the appropriate menu item.
Make some adjustments in Assets and ItemsView so it won't collide with
the context menus used there.

Task-number: QDS-4757
Change-Id: Ied9dabdbb4359a05b654bfc2a26829da46700239
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-08-05 10:00:42 +00:00
Henning Gruendl
3bf5be3c46 QmlDesigner: Update look of empty pane
* Remove section
* Center the hint label vertical and horizontal

Change-Id: Ia52f7af9c0d6f2fa8099efbf9dd80ff94a5f29aa
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-08-04 21:58:38 +00:00
Henning Gruendl
65055989f9 QmlDesigner: Fix a couple of undefined warnings
Change-Id: I6bf62904a3fc4b45252f3859d6996c28b459d949
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-08-04 21:58:29 +00:00
Henning Gruendl
e9b2613f5e QmlDesigner: Fix blocked state binding
Change-Id: I75bcf77c7f5e5f4314db0e5b5872325c5ec34377
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-08-04 21:57:43 +00:00
Henning Gruendl
77aca0df94 QmlDesigner: Fix text editor template
Change-Id: If0db1055d5564f5696448e962f569d797e1ea222
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-08-04 21:57:23 +00:00
Henning Gruendl
d199b0ea8c QmlDesigner: Componentize property editor pane
* Componentize the part of property editor pane which is used in
  QtObjectPane, ItemPane and Object3DPane
* Update QtQuick import version in ConnectionsSpecifics and
  QtQml/QtObjectPane

Change-Id: I9590da2208bbf36c444cc72e8e0bc9159d07e4ce
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-08-03 21:05:33 +00:00
Eike Ziller
17d716118a Merge remote-tracking branch 'origin/5.0'
Change-Id: I4236e3d2f87d56aea787905f4b78b1f5f933c069
2021-08-03 14:19:44 +02:00
Mahmoud Badri
ed759b4100 QmlDesigner: Allow asset unselect using Ctrl + click
Fixes: QDS-4740
Change-Id: Iad81714eafe4de7e1e129d2139796d954935c088
Reviewed-by: Miina Puuronen <miina.puuronen@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2021-08-02 12:04:15 +00:00
Henning Gruendl
ed80753466 QmlDesigner: Add tooltip to annotation buttons
Task-number: QDS-4152
Change-Id: I0f3b6cd556e5c1bba55f38e82ab97cd55f044035
Reviewed-by: Tanja Remes <tanja.remes@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-08-02 09:56:44 +00:00
Henning Gruendl
6839ad0118 QmlDesigner: Update alignment buttons
* Fix spelling in type name
* Add missing justify option and adapt layout
* Add property enabling setting scope
* Update icon font

Change-Id: I8070abd43724ad7e140bab7166e4f1c3d828d07d
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-08-02 07:56:14 +00:00
Henning Gruendl
0771fba5f9 QmlDesigner: Move ComponentSection to HelperWidgets
Change-Id: I6edcc461c3014fc2721c1248f600170acb509c44
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-08-02 07:55:58 +00:00
Thomas Hartmann
98fd0fc01a QmlDesigner: Fix custom scrollbar for Qt 6
Task-number: QDS-4666
Change-Id: I054ea088f4e7f4806eba35b211c441b58f4128c0
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
2021-07-30 13:22:23 +00:00
Miina Puuronen
13a6f756b7 QmlDesigner: Implement Delete File for Assets Library
It is now possible to delete assets from Assets Library using the
Delete File context menu option. Before deleting we ask for user's
confirmation, warning them the file might be in use somewhere. This
question can be toggled on/off from Options.

Task-number: QDS-4488
Change-Id: Idc33d0ee5895a17b983b61a2b8cd5d9ea2c95c25
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-07-30 07:53:42 +00:00
Orgad Shaneh
69c6c9f7d5 Merge remote-tracking branch 'origin/5.0'
Change-Id: I4ea793c0b2d1980e5ed79bcc985c0f26a4de7aa4
2021-07-29 16:03:09 +03:00
Henning Gruendl
20b5182665 QmlDesigner: Fix ComboBox item delegate
* Fix undefined warning about enabled property assignment
* Rename the model variable

Task-number: QDS-4730
Change-Id: Iba6fdc8b4a0393a405060e4cbc7a8c58849ed76b
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-07-29 09:14:12 +00:00
Henning Gruendl
8df1da1c64 QmlDesigner: Fix blocked by template state
* Fix a missing negation operator on the blocked by template state in
  font section
* Fix incorrect indentation

Change-Id: Idc774d8329a14df1722a5a5db65ab39dadf0063e
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-07-29 09:14:04 +00:00
hjk
185ceda8f1 Debugger: Make user defined gdb-style dumper work with arrays
Change-Id: I1667061eacf78a6fa4df567ea033e7bb5269da2c
Done-by: Bruno Vasselle
Fixes: QTCREATORBUG-26027
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-07-29 07:25:59 +00:00
Janne Koskinen
12fb534f90 Fix puppet from asserting on unversioned qml imports on Qt 6
Set mockup version to 1.0 if there is no version set.

Change-Id: Icfee0e84012a93978283d8309ec01d48dd8d4730
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-07-28 06:49:45 +00:00
Henning Gruendl
ba99d2b682 QmlDesigner: Fix SpinBox hover state
Task-number: QDS-4726
Change-Id: I3ca83d20458f271df942339cca93d4a4a991f779
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-07-27 17:40:13 +00:00
Henning Gruendl
78213e2513 QmlDesigner: Update missing specifics
* Update a couple of missing specifics
* Update copyright header

Change-Id: Id0efb65b0614e471f33c048af7d3f49f268f20b8
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-07-27 09:30:16 +00:00
Henning Gruendl
45fa409e25 QmlDesigner: Fix warnings parameter injection
Fix a couple of warnings regarding parameter injection

Change-Id: Ie4a7c57a735eacb9b864b967f26d48787652de20
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-07-27 09:30:08 +00:00
hjk
09286d062f Merge remote-tracking branch 'origin/5.0'
Change-Id: I074571dac56b26a8a1449c29aef53b9052d8e304
2021-07-22 15:00:19 +02:00
Thomas Hartmann
c59bddd4df QmlDesigner: Fix crash for QQuickStyleItem
QQuickStyleItem crashes if componentComplete() is called.

Change-Id: I1df1b50f6ba95c0eda1ff8e18de85276a6de04f5
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-07-22 08:06:31 +00:00
Henning Gruendl
6fef74a8cb QmlDesigner: Add RGB und HSV picker
* Add modes to color picker
* Add color picker for RGBA mode
* Add color picker for HSVA mode
* Add luminance slider for RGBA mode

Change-Id: I0bb1dbb67b7c18d156eee0d4e07cfa942162f832
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-07-21 10:25:51 +00:00
hjk
f46c8b5c92 Merge remote-tracking branch 'origin/5.0'
Change-Id: I9409f35cb9d1bc2e57631d2bfa3a0931ff5dd259
2021-07-21 09:18:52 +02:00
Thomas Hartmann
ef8f18fb70 QmlDesigner: Do not instanciate ApplicationWindow
Change-Id: I7a57de60aba72823579e986e9ad6278c4a7e84a8
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2021-07-19 07:53:39 +00:00
Eike Ziller
92b5afc3de Merge remote-tracking branch 'origin/5.0'
Change-Id: If0cbc808d2c466aee81a77b3c078bac7a3d1e4cb
2021-07-15 09:48:08 +02:00
Knud Dollereder
30f6084f0d Execute pixmapChangedCommands only if items have changed
This patch prevents continuous image updates by making sure
to only execute pixmapChangedCommnds if an item is dirty.

Change-Id: Icadc1d8a2a2298d18147b31fbed3fbc4205f0ea8
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-07-14 20:54:29 +00:00
Henning Gruendl
4d4fce3cfe QmlDesigner: Fix SpinBoxes blocking wheel events
Change-Id: I99a30926e65805c6198786f46c65392b65f52d65
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-07-14 11:36:13 +00:00
Henning Gruendl
8b8f7dca4d QmlDesigner: Make ColorEditor scrollable
Make the ColorEditor react to mouse wheel events when having the mouse
inside of it. Use a WheelHandler to forward wheel events to the ItemPane
by calling the flick() function.

Task-number: QDS-4698
Change-Id: Ic1bcaf21e80d6bdc6dfcc6eb2e4b0341778a7c2f
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-07-14 11:36:06 +00:00
Kai Köhne
e030d04892 Auto Test Project: Prefer Qt6 over Qt5
Be consistent with the other wizards, and prefer Qt6 over Qt5,
if both are available.

Change-Id: I3a2f1c04c372a98ae6dacd884344fdd8d2ea2deb
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-07-14 11:15:38 +00:00
Henning Gruendl
0ba7c5c0d5 QmlDesigner: Update Hue/OpacitySlider handle
* Update the look of the HueSlider and OpacitySlider handle to be more
  visible and at the same time show the picked color/transparency
* Fix undefined warning in ExtendedFunctionLogic

Change-Id: Ib593a385f80f199e80aeff5a862efb22aca88c3a
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2021-07-14 11:05:49 +00:00
Eike Ziller
f08bd9df91 Merge remote-tracking branch 'origin/5.0'
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri

Change-Id: Iba1e6cacaebf9bb4653ac77e981ddacaf729c52c
2021-07-14 12:20:35 +02:00
Henning Gruendl
55082986e1 QmlDesigner: Introduce blocked state for labels
* Create blocked states for PropertyLabel, ControlLabel and
  MultiIconLabel
* Rename and cleanup the MCU blocked state properties
* Add missing MCU related control blocked states
* Remove majorQtQuickVersion usage
* Add context for the translator
* Fix a nested SecondColumnLayout
* Add missing property control in Column- and RowLayout
* Remove comments from EditableListView

Task-number: QDS-4692
Change-Id: Icb93fe153241f015ced54409a953a3318c7763ae
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-07-14 08:03:15 +00:00
Tim Jenssen
453f4996db use "qml" as QML runtime
Since Qt 6.2 qmlscene is deprecated by Qt.

This patch also removes QMLViewer as a last
QtQuick 1 artifact in external tools.

Task-number: QDS-639
Task-number: QDS-4535
Task-number: QTCREATORBUG-22385
Change-Id: I5f67040954f8ef438961f7166a53bd96d5b73f4d
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-07-13 15:38:46 +00:00
Eike Ziller
e45eaf500c Merge remote-tracking branch 'origin/5.0'
Change-Id: I9dca34a9895d19ace05aef5b73e9a806b23607fb
2021-07-09 14:11:59 +02:00
Henning Gruendl
d6f717d0f8 QmlDesigner: Fix blocked/disabled state colors
* Fix color controlsBackgroundDisabled color in light themes
* Fix color value in RealSpinBoxIndicator state disabled
* Remove opacity change in AnchorButtons on enabling/disabling

Task-number: QDS-4692
Change-Id: I9adb28f54b8016bfffdd28f022fc746c629afe9f
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2021-07-08 17:58:31 +00:00
Henning Gruendl
e8e32894cc QmlDesigner: Update EditableListView
* Apply new design to EditableListView
* Add hovered property to IconIndicator

Change-Id: Ie208d4de8fab8f7ca62856d80d1ad1decc609f1a
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2021-07-08 10:52:24 +00:00
Henning Gruendl
c08f8fa155 QmlDesigner: Fix AnimationSection layout
* Fix AnimationSeciton missing SecondColumnLayout
* Fix QML Connections deprecation warning by using function syntax

Change-Id: I2a34b94b3e07397eb42984dd851b1cc7c6adca9d
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2021-07-08 10:51:55 +00:00
Eike Ziller
f16276c792 Merge remote-tracking branch 'origin/5.0'
Change-Id: I368fffe959c10f5942ccb1bcdb1fed4ac1a7460b
2021-07-08 11:16:06 +02:00
Tim Jenssen
22a87fdd95 qmlpuppet: adjust to api changes in Qt 6.2
Change-Id: I3c9139cacb7ff9eb7b8138e0a7f589280a24c13a
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2021-07-07 17:40:26 +00:00
Orgad Shaneh
84839ee397 Merge remote-tracking branch 'origin/5.0'
Change-Id: Ia018600fb257c9523fc9d15faa5bd8300840e3de
2021-07-05 12:17:45 +03:00
Cristian Adam
3a503a7eb0 QmlPuppet: Builds fix for Qt5
Amends 7c0652b7ac

Change-Id: I55792a5468b5cf7e9eedb6a105abe468c48ecd2d
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2021-07-02 18:44:22 +00:00
Mahmoud Badri
ca23fa4359 QmlDesigner: Remove space at the top of the assets lib
Now hidden section header doesn't occupy space.

Change-Id: Ied4e9ee3c7601c291383f73337e98cb7ffd77f54
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2021-07-02 14:15:43 +00:00
Leena Miettinen
ffd94f1138 QML Designer: Fix UI text in Properties view
- Check capitalization of UI text (titles, headings and captions
  should use title case; labels should use sentence case)
- Fix some label text
- Fix some tooltips

Task-number: QTCREATORBUG-25915
Change-Id: Ifaffe77fa5ad3f9f310bd470ef59b021c1cf6456
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
2021-07-02 13:52:08 +00:00
Miikka Heikkinen
7c0652b7ac QmlPuppet: Small optimization to rendering 2D content in 3D scene
There is no need to read back the texture into image when rendering
2D content for embedding into 3D scene, so don't do that.

Change-Id: If84619bdc20e6997733effc4745a496fab69e5b8
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2021-07-02 13:37:54 +00:00