Commit Graph

7030 Commits

Author SHA1 Message Date
Thomas Hartmann
89488d1cf1 QmlDesigner: Further reduce the direct dependecy on GradientLine
Change-Id: I1c7d9b87f2b2c16393bd672fe80356aca8b6e2d3
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
2022-07-21 10:17:43 +00:00
Thomas Hartmann
33a7de0c88 QmlDesigner: Remove usage of gradientLine in ColorEditor
Using the model instead.
We still have to get rid of gradientLine.currentColor.

Change-Id: I9c7a9e6852e70525a6abddfbd874b6a7cc4d7691
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
2022-07-21 10:17:37 +00:00
Thomas Hartmann
ba6f85f4a7 QmlDesigner: Move GradientModel to ColorEditorPopup
The model is used to handle state and to render the preview in the color
editor. Therefore we need the model outside of the GradientLine.

Change-Id: Ia8c171d0cba6b944a8ac8b557d2f7be4e813b342
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
2022-07-21 10:17:25 +00:00
Thomas Hartmann
1e628d9806 QmlDesigner: Split ColorEditor in ColorEditor and ColorEditorPopup
Ideally the popup is only created on demand. This is the first step into
this direction.

Change-Id: I085ee645f9d35aedd9fd4b61b7749a649b06850f
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
2022-07-21 10:17:16 +00:00
Thomas Hartmann
c92216aea5 QmlDesigner: Add QML files from assets_imports
Otherwise they do not show up in the project explorer and
more importantly we do not generate the proper cmakefiles.txt.

Task-number: QDS-7279
Change-Id: Ib6cbd839cee2ec5ded09e57d2097b75f1a1e68e9
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-07-13 11:30:00 +00:00
Brook Cronin
574d4cb108 add material editor and browser to 3D essentials workspace
Change-Id: I32cab4ce1ffd0d7d42d442389652ce67ec2f4cfe
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-07-08 09:37:22 +00:00
hjk
5b2ae8bdd0 Translation: Remove duplicates in Japanese translations
Amends 290c86f55c.

These slipped through earlier as Qt 6 based lrelease was flagging
wrong messages as duplicates, leaving no good hint on the true ones.

Change-Id: Ic9d94cc35d588dca0e0b1f0c34e00c4a7ee4ceee
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-07-08 08:19:26 +00:00
Thomas Hartmann
ce6083992b QmlDesigner: Remove hex label
Change-Id: I9bb5ba47cdbc286544417b95cc9cf9c6ca3943cb
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-07-08 07:39:33 +00:00
Thomas Hartmann
ee08375384 QmlDesigner: Export spacer and combobox as alias
Change-Id: I6fdd192974263df1d963b7847a2713c551783d2d
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-07-07 17:13:33 +00:00
Thomas Hartmann
97afa4a91a QmlDesigner: Export spacer as alias
Change-Id: I9890d1533de8b3f27bb94c0bccb6d2ed52c21f8f
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-07-07 17:07:41 +00:00
Marcus Tillmanns
06be8a4325 lldb: Fix type inspection for QMetaType template types
lldb's FindFirstType() expects template types to have specific
whitespaces set. QMetaType's "name" parameter does not contain
the necessary whitespaces.

This solves that by changing e.g.: "T<A,B<C,D>>"" to "T<A, B<C, D> >".

Change-Id: I7505db96b01d433408af1942cd81e50094833c06
Reviewed-by: hjk <hjk@qt.io>
2022-07-07 12:21:38 +00:00
Henning Gruendl
1f1570f0e6 QmlDesigner: Fix hover issue in UrlChooser
Fix UrlChooser ItemDelegates not getting the hover event due to a
MouseArea overlayed on top which also accepts hover events. This issue
wasn't there in Qt 6.2.4 and only happend since Qt 6.3.1

Change-Id: Ifc43fe70fbefab9696a17a59966afdaf47b93829
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-07-06 11:34:05 +00:00
Thomas Hartmann
a1a5ad2017 QmlDesigner: Fix license headers
Those files originally came from Qt.

Change-Id: I724c98d2a09fb004f19042f348e0994ae1970b73
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-07-04 14:56:01 +00:00
Alessandro Portale
c899793b37 Android: Fix version mapping from sdk_definitions.json
- Support multi-digit values for version ranges, via "+" in the RegExp
- Turn the RegExp expression into a raw string for easier reading
- Fix shortVersion (Maj.Min.-1) handling by appending the ".-1"
- Explicitly define the Patch number range for 5.15 in sdk_definitions

Change-Id: Icf22f2b4f865b4d5bcff48569aa58137294129ce
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-07-04 08:26:04 +00:00
Mahmoud Badri
5a9a6804ee QmlDesigner: Implement drag-n-drop materials to the 3D Editor
Fixes: QDS-7011
Change-Id: Id6e4aea2c19561ea861507480636ae2358ece067
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-07-01 15:38:29 +00:00
Tim Jenssen
56bcad81ad Merge remote-tracking branch 'origin/7.0' into 8.0
Change-Id: I7cd5d3808007ef739212f4347ba9b16e7b298943
2022-07-01 09:22:10 +00:00
Miikka Heikkinen
e661135d13 QmlDesigner: Remove QML Image level caching of items that can change
Icons generated for components can change if the component is edited,
so don't cache them locally at Image level.

Also increased the compression timeout for component library updates as
200ms can sometimes be too short during project load.

Fixes: QDS-7068
Change-Id: I98a0920c4237a1147e9fb5da834e1dc235ae28f5
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-06-30 12:04:57 +00:00
Thomas Hartmann
4c5b67ff4a QmlProject: Use correct family name for Titillium Web
Change-Id: I50b0aa0741520117bf79700eecd7167c57673166
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
2022-06-30 09:14:46 +00:00
Henning Gruendl
4972b8fad6 QmlDesigner: Add icon section to AbstractButton
* Add icon section to all property editor specifics related to
  AbstractButton
* Add icon as a banned property for MCU
* Fix disable state in FilterComboBox
* Add QQuickIcon as a special type in node meta info

Change-Id: I77595337a049952ab030210d90bc1a11327cf79c
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-06-30 09:14:07 +00:00
Henning Gruendl
d6f5644e70 QmlDesigner: Fix ControlLabel elide
Change-Id: Ib5d838c2da8f964d825c8611c8fe0b13a95d88d9
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-06-30 09:13:55 +00:00
Henning Gruendl
8a31be38e3 QmlDesigner: Add InsetSection to Control specifics
Change-Id: If85a1c985d1ad7b017e290dab9526b822395f19a
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-06-30 09:13:45 +00:00
Henning Gruendl
7cf96e1209 QmlDesigner: Add Control property specifics
Task-number: QDS-6621
Change-Id: I4bded48e95688321796b8db311f6d4acc9c5e45a
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-06-30 09:13:35 +00:00
Mahmoud Badri
234958a47a QmlDesigner: Enable drag-n-drop a material to a model in Navigator
Fixes: QDS-6694
Change-Id: I2fb32052559b1d459cc8025e9f30368b0189e8ab
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-06-29 10:32:03 +00:00
Christian Kandeler
9cbe2439dd CppEditor: Do not highlight macros as preprocessor statements
Macros are used like identifiers; there is no reason why they should need
to have the same highlighting as a preprocessor directive.

Fixes: QTCREATORBUG-23548
Change-Id: I186befc06ccb36a00451fd707c41e3687a84af14
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-06-29 09:08:27 +00:00
Christian Stenger
e7d90c23b6 Dumper: Fix dump of std::string on macOS
Try to handle the alternate layout of strings correctly.
Depending on the defines and the endianness the string structure
may vary quite a bit. Old approach just took care of the default
layout and the endianness.
In case of an alternate layout of strings we failed so far.

Fixes: QTCREATORBUG-26175
Done-with: Viktor Govako
Change-Id: I788eb5619408bca281eb887c3f6a269808c27d24
Reviewed-by: hjk <hjk@qt.io>
2022-06-27 11:00:43 +00:00
Ippei Sugita
290c86f55c Partially update Japanese translations
This is meant to rescue/review the translated strings.
lupdate has not been used yet.

Change-Id: Ia5a3acc25ba59709b0f638c19f6e9f40afeff7be
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
2022-06-24 13:40:45 +00:00
Alessandro Portale
90e691251f Fix install command in wizard generated CMake files for Android
"error: install TARGETS given no LIBRARY DESTINATION for module target
<...>."

Change-Id: I9b283e342b32c7d3df44bb5aed231b843e3e54ae
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-06-24 11:53:17 +00:00
Henning Gruendl
85cd97a334 QmlProjectManager: Update landing page
* Make landing page responsive
* Use QtCreator welcome page theme colors
* Remove CMake from landing page
* Separate colors from values to make mocking data less redundant
* Add quick version to qt version check
* Use qml singleton for backend instead of using the root context item

Change-Id: Ic303d4713c348e34197716031b303720702f3e98
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-06-24 11:48:35 +00:00
Brook Cronin
21ef02a016 update fixed version of icon font
Change-Id: Iedf945b3718d4df245e24ac1ba756b20f6ed9cf1
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-06-24 09:46:21 +00:00
Miikka Heikkinen
8a8a2f5c55 QmlDesigner: Unify the background of 3D preview images
Added 3D checkerboard floor on all 3D previews.
Since shadows generally look bad for arbitrary 3D scenes, and would
mostly be obscured by the model itself as we want the light mostly
from the front, removed shadows also from the material preview to unify
the previews.

Qt5 had issues rendering the 3D floor texture, so used a static image
there, as Qt5 only generates previews of one size.

Fixes: QDS-7078
Change-Id: I74d094878ed01e6e531ad60df1f8d9d7cf415860
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-06-23 13:06:04 +00:00
hjk
8bb22fa4f3 Debugger: Fail gracefully on systems without working base64 module
Change-Id: I341b0fdb1c9e32fda3ce80f3e7569cffbb0708d2
Reviewed-by: Rafael Roquetto <rafael.roquetto@qt.io>
2022-06-23 08:26:02 +00:00
Henning Gruendl
5903d82c0b QmlDesigner: Fix hover color for ButtonRow
Use the default background color for ButtonRow buttons on global hover.
This needs to be done to distinguish between hover and global hover on
ButtonRow buttons as we unified the two colors as an attempt to make the
UI a bit less noisy.

Change-Id: I63f9c730367e9b906a772a63210c7ca548647352
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-06-22 17:34:15 +00:00
Miikka Heikkinen
359f4f1767 QmlDesigner: Fix material editor/browser texts
Fixes: QDS-7083
Change-Id: Ib4a5269e275c7811a5645bbff54e3b0ec95ec302
Reviewed-by: Mats Honkamaa <mats.honkamaa@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-06-22 10:44:59 +00:00
Miikka Heikkinen
41986d7942 QmlDesigner: Show IconButton tooltip also when button is disabled
Fixes: QDS-7076
Change-Id: If412827e22c6f71a9f073d1c868dcdb325870c1d
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-06-22 10:44:50 +00:00
Henning Gruendl
2de2a4808a QmlDesigner: Fix FontComboBox drag'n'drop
* Fix URL schema to also work under macOS
* Avoid setting font name and further processing if error during font
  loading occurred

Change-Id: I9d07a3daad8f7c8c464422b0cf3f94d61e4b231d
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-06-21 12:22:56 +00:00
Thomas Hartmann
db8dbe25e0 QmlDesigner: Add a wizard for a ui.qml .qml file pair
Task-number: QDS-5963
Change-Id: I16ee8361779f11ca2f24f35877869f3e83279d10
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-06-21 12:16:40 +00:00
Christian Stenger
fcb2807efa Wizards: Make PySide6 default
Change-Id: I6d84261e56dafcd55b7842e140d9c09935df70a8
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-06-20 12:26:03 +00:00
Miikka Heikkinen
9c3636af49 QmlDesigner: Ensure materials render properly after puppet reset
This is a workaround for quick3d issue QTBUG-103316, where
material library materials for editor are properly initialized only
if the first encountered View3D in the scene is also rendered first.

Fixes: QDS-7084
Change-Id: I8bb6a8e6bfe2fcffddfe86f92157d386fdf4095d
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-06-16 13:53:43 +00:00
Samuel Ghinet
50aadacb6e QDS Editor 3D: Allow the user to select (and reset) the color of grid lines
Task-number: QDS-7122
Change-Id: I686269e61b53bd5e3d5d1225376930612d869072
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-06-16 10:17:01 +00:00
Christian Kandeler
07dfd7c0b3 Wizards: Bump QtQuick import version in file wizards
Use 2.15 as default, plus a little heuristic to use the same version as
other files in the project.

Fixes: QTCREATORBUG-27614
Change-Id: Ic84db5da97a9f35a2ad0e57fd47b75fb32a0b7f8
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-06-16 08:23:14 +00:00
Eike Ziller
87645d7355 Fix Qt Quick Application wizard for Qt >= 6.2
Wrong variable used in the template's CMakeLists.txt resulted
in errors when configuring.

Amends db2cc2ba27

Fixes: QTCREATORBUG-27725
Change-Id: Id644ba83e118de1f12f4cdb4caa6368bd418419d
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2022-06-16 06:18:02 +00:00
hjk
7f7768cdd1 Debugger: Add simple dumper for QSettingsKey
Change-Id: Ieaa702051066e7dcf7f0bd44d869e5a231c19112
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-06-15 06:29:55 +00:00
Eike Ziller
db2cc2ba27 Add install command to wizard generated CMake files
Add a default install(TARGETS ...) command.
It doesn't hurt on desktop and mobile targets, and it is required for
deployment on remote Linux devices.

Change-Id: Ib39c6130b63a9a699ff5cd81756c2913b1246142
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-06-14 07:45:00 +00:00
Thomas Hartmann
7ae288d355 QmlDesigner: Use changed properties to update 3D preview
EffectReference is always dirty and it is the only dirty flag.
Instead, we update now if any property changed.

Task-number: QDS-7079
Change-Id: I157cf2d3b15120c33f4a6b3f53e526d555c7f80c
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-06-13 08:35:11 +00:00
Thomas Hartmann
13c1b6f237 QmlDesigner: Do not apply smooth rendering if root is a 3D node
Task-number: QDS-7136
Change-Id: I5260153b8d6131160a8d4b67418e81c6f6e4d862
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-06-13 08:12:39 +00:00
Miikka Heikkinen
dedbbc75b5 QmlDesigner: Apply root item transform in Node component previews
When generating a preview from a component with a 3D node for a root,
the root Node transform is now applied when calculating camera zoom.

Fixes: QDS-7131
Change-Id: I73054a09b3e82868c999ef6f9797dc941e625b33
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-06-10 13:15:05 +00:00
Miikka Heikkinen
36dbc62a1d QmlDesigner: Queue puppet processes during import
On some systems launcing multiple simultaneous import processes causes
imports to fail. Fixed by only launching single process at a time
and queuing the rest.

Fixes: QDS-7107
Change-Id: I330c5920dcbd74d3b4f2e7f40899795a4fbaf3ac
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-06-10 09:31:03 +00:00
Thomas Hartmann
d8c605179a QmlDesigner: Add option for smooth rendering in form editor
Smooth rendering turns on MSAA and doubles the resolution for
rendered items. With this option enabled everything stays smooth when
zooming in. Around factor 8-10 pixels become clearly visible again, but
it still looks relatively smooth.
I added both MSAA and increased the resolution to one option, for simplicity.
The smooth mode takes 4 times the shared memory, which should not
be an issue in most cases.
For now, the option is not the default.

Task-number: QDS-7129
Task-number: QDS-7128
Change-Id: I8a778650bb40f8ba796960db9bc966e8a1efff4e
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-06-10 09:04:11 +00:00
Thomas Hartmann
a5d501d22e QmlDesigner: Fix template
Add missing '}'

Task-number: QDS-7125
Change-Id: I7ecf80d681de0400368e28b98179488db560381e
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-06-09 07:32:44 +00:00
Assam Boudjelthia
1cf9d06675 Android: update NDK version for latest Qt version (Qt 6.4)
Since Qt 6.4 is built with NDK r23b, use that by default for
user apps as well. This is also needed to account for QTBUG-102972.

Task-number: QTBUG-102972
Change-Id: Id8485e0477b5e36c4d895582f5700c1f16b5a0c5
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-06-08 21:07:43 +00:00