Commit Graph

6578 Commits

Author SHA1 Message Date
Eike Ziller
b09b6bd747 Merge remote-tracking branch 'origin/5.0'
Change-Id: I370268624bd6e91e7b44fa236e913f5f55867e17
2021-08-20 09:50:30 +02:00
David Schulz
3677f0be74 Editor: fix "parameter" default value in color schemes
Fixes: QTCREATORBUG-26124
Change-Id: I68c1a2c9df398beb6d8db82f85a0b9641b611539
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-08-19 12:03:44 +00:00
Thomas Hartmann
d5214b0e45 QmlDesigner: Do not create components from componentPath in importPaths
If the component comes from the import paths we should not create
the component directly. This can have subtle unwanted side effects.
Styling for example is not working with Qt 6.

Change-Id: Ia4f33b46d3dc427ac95838f2ca73a880639d600a
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-08-19 11:21:30 +00:00
Henning Gruendl
e3ac8a79b9 QmlDesigner: Fix editable ComboBox
* Fix editbale ComboBox by replacing TapHandler with MouseArea as nested
  TapHandler doesn't get triggered anymore with Qt 6
* Remove unnecessary when condition in ComboBox

Task-number: QDS-4905
Change-Id: I11439c1bb2c1dac8709bf7e1744b33990d9a1f86
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-08-19 11:21:19 +00:00
Miikka Heikkinen
ffd8ebd17b QmlPuppet: Remove 2D rendering from InformationNodeInstanceServer
Using cross-window 2D content in 3D scene is prone to crashing,
and causes also issues with the primary purpose of
InformationNodeInstanceServer, i.e. getting the information, as the
rendering will remove dirty flags from nodes prematurely.

Fixes: QDS-4858
Change-Id: I9057889a28d36f12f1e401e9a39f808d66637681
Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-08-19 08:08:35 +00:00
Aleksei German
d7b42e5455 Python: Fix for Wizard generated file names
- Changed generated project filenames
 - Added default Class name

Task-number: QDS-4897
Change-Id: I16318cf7cbdcf078f4da01016ebeef8036a85eb0
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-08-19 08:06:34 +00:00
Eike Ziller
94d352ab28 Merge remote-tracking branch 'origin/5.0'
Conflicts:
	src/plugins/autotest/testresultdelegate.cpp

Change-Id: If172206f231fc2a9f4a672cd2e6eaeaea4988c96
2021-08-18 16:14:24 +02:00
Henning Gruendl
d1eebb4d2a QmlDesigner: Fix component button size
Task-number: QDS-4751
Change-Id: I18a60c304e52e6defa9cfc13087a15782033b091
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-08-18 09:13:20 +00:00
Henning Gruendl
3ccd0976cb QmlDesigner: Fix broken visibilityOff icon
Task-number: QDS-4815
Change-Id: Ie872a2f899c57faf06f7cb6ee54504a8e5168356
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-08-18 09:13:11 +00:00
Eike Ziller
6d44c28f0a Merge remote-tracking branch 'origin/5.0'
Conflicts:
	src/libs/utils/qtcprocess.cpp

Change-Id: I1f7419d927e8534dfdcd10db998f97a6efd4d3e4
2021-08-18 09:48:39 +02:00
Henning Gruendl
3c0b75f2ef QmlDesigner: Fix injection of parameters warning
* Fix a warning about injection of parameters into signal handlers being
  deprecated
* Fix comparison operator

Change-Id: I33d0fe21f39feea69bcca82a57036594d28b039a
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2021-08-17 10:00:10 +00:00
Alex Richardson
ebc229a25b Debugger: fix QString printing in LLDB with python3
Before this change I was seeing all strings as
`<failed to decode '...' as 'utf16'>` when using LLDB bundled with CLion.
This error is misleading since the actual exception raised from the python
code was `'str' object has no attribute 'decode'`. To fix this, I updated
the hexdecode() method on Dumper to accept an optional encoding argument
and use that instead of the python2 str.decode().

Change-Id: Ic3afc786c42fd7384d9dc3117f0871837076c2ba
Reviewed-by: hjk <hjk@qt.io>
2021-08-16 09:34:28 +00:00
Eike Ziller
ab606faad2 Merge remote-tracking branch 'origin/5.0'
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri
	src/plugins/android/createandroidmanifestwizard.cpp

Change-Id: Ibd06a254f52c2c96d8c6ddd6b1d27483fcc29a17
2021-08-16 10:51:50 +02:00
Henning Gruendl
14d1726c95 QmlDesigner: Fix crash with ColorEditorSingleton
Fix a crash that was caused by ColorPaletteSingleton being shared among
multiple QQnlEngines. Each engine requires a unique instance of
ColorEditorSingleton.

* Rewrite ColorEditorSingleton to not be a singleton anymore
* Rename ColorEditorSingleton to ColorEditorBackend
* Add meaningful warnings

Task-number: QDS-4728
Change-Id: I1ed3315add33754b41870ad6f43c1365a899102b
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-08-16 07:23:20 +00:00
Janne Koskinen
b8b6af0dbb Add 3D editor Gizmo for Quick3DParticles
Adds an icon for Particle System Component making the component
visible in the editor allowing picking.

Task-number: QDS-4784
Change-Id: Ie6cffa9cfe3bb6a693372d7a7b4341e17f89911f
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-08-13 11:23:19 +00:00
Henning Gruendl
d3b6777d12 QmlDesigner: Fix button tooltip blocking event
Fix HelperWidgets AbstractButton nested TooplTipArea blocking hover
events from the actual control.

Task-number: QDS-4828
Change-Id: Ibd390c98805a49f903663b6c38091f727c2b7ec9
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-08-12 14:07:31 +00:00
Eike Ziller
ba5f2e27f0 Merge remote-tracking branch 'origin/5.0'
Change-Id: I86049934ae744e22e4a728ab79c0cf6880ff3c7d
2021-08-12 11:05:11 +02:00
Henning Gruendl
714f67bfc8 QmlDesigner: Temporarily remove linking/mirroring
Remove the linking indicator and the mirroring buttons until the
functionality will be implemented.

Change-Id: I7d76209fc8c184001690b001cbb0e9a8255bde9f
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-08-11 11:21:46 +00:00
Eike Ziller
c7168d1063 Merge remote-tracking branch 'origin/5.0'
Conflicts:
	src/plugins/coreplugin/locator/executefilter.cpp

Change-Id: Iff5b82a9e491b782e4720138904f389d318b005c
2021-08-11 10:10:51 +02:00
Tim Jenssen
27d414458e qmlpuppet: fix qt 5.15 builds
Change-Id: I6d19624537a3980252d43624ecf24e110638225a
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-08-10 09:07:41 +00:00
Miikka Heikkinen
2c7b2ad685 QmlPuppet: Fix incorrect initial render size/scene for edit 3D
The scene id was stored as array of QChars instead of QString, which
caused issues restoring the correct scene at puppet reset.
The intitial incorrect render size was caused by not changing the
render window size in addition to root QML item size.

Fixes: QDS-4586
Change-Id: Id6b16d778a9d886e8fdc40eab1e549d13091f8f4
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-08-09 14:00:19 +00:00
Eike Ziller
ffe03c7870 Fix Qt Quick Extension wizard's kit selection
Do not require kits to be Qt 5, instead require it to support QtQuick 2.

Fixes: QTCREATORBUG-26082
Change-Id: Icf34644eef704b28e80ef7b130fd2a68539347e7
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
2021-08-09 12:50:34 +00:00
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