Commit Graph

7857 Commits

Author SHA1 Message Date
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
hjk
26dd8aef2a Python: Convert to Tr::tr
Change-Id: I0241053b0d51dbb1a60c43351cbff543fd52573d
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-07-21 08:25:04 +00:00
Eike Ziller
3ec87e37ee Merge remote-tracking branch 'origin/8.0'
Conflicts:
	src/plugins/todo/optionsdialog.cpp
	src/plugins/todo/todoprojectsettingswidget.cpp

Change-Id: I24ca90c2fc2cd707df901d42694df6d0e27d696d
2022-07-20 12:03:40 +02:00
Thomas Hartmann
a3f08d8ac6 QmlDesigner: Add default Connections to wizard template
Task-number: QDS-5963
Change-Id: I894ce59adfaafa6ff71d6fa958b8aa836564a20a
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-07-15 14:23:24 +00:00
hjk
ab90298fde ToDo: Convert to Tr::tr
Change-Id: I2bd081fd484f851234c7e54114a15488271e0df1
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-07-13 12:56:47 +00:00
Eike Ziller
e2d5936a76 Help: Convert to Tr::tr
Change-Id: I3f9ca195488f7cc90e7f58eb15263dde1bc911c4
Reviewed-by: hjk <hjk@qt.io>
2022-07-13 12:30:46 +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
hjk
b1f9cdac35 Qnx: Move to Tr::tr
Change-Id: I43b49d325a129c180869140c4ae1774f7f89d2fd
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-07-13 10:52:18 +00:00
hjk
3de1fffbeb ImageViewer: Convert to Tr::tr
Change-Id: Id12dc265ed60be942ec68ac5a80f57144c2d086f
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-07-12 13:37:00 +00:00
Eike Ziller
90a03391d7 Merge remote-tracking branch 'origin/8.0'
Change-Id: I37a1f78caf9ae258c6b052efa3be15b3dbcbe164
2022-07-12 13:56:23 +02:00
Tim Jenssen
05f9769d91 qml2puppet: fix build
Change-Id: I0f06da77efe852cd8f4b914a4dc843fabbdd8f31
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2022-07-12 09:58:52 +00:00
Tim Jenssen
d6c10e775d qmlpuppet: remove qmlprivategate DesignerSupport < Qt 5.6
Task-number: QTCREATORBUG-26600
Change-Id: I629c8cd1f497ed2dd354ff461aa890a77bdc2a01
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-07-12 09:20:04 +00:00
hjk
1280f771fb Bookmarks: Remove some obsolete and now dumplicated translations
Change-Id: I17ea9058fa88eec89412401f52d53fc96f42db39
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-07-11 13:39:34 +00:00
Marco Bubke
67324512e9 QmlPuppet: Adapt to C++ 17 [[maybe_unused]]
It has the advantage to to move the attribute to the declaration instead
of using a workaround.

Change-Id: Ia6115ab8fefbe03f247edfea2b7bed73e9149068
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2022-07-11 09:29:37 +00:00
hjk
866f20e4f9 Valgrind: Use Tr::tr
Change-Id: I77b27462d88079699e620ef459f951846c15c3e2
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-07-11 07:14:37 +00:00
Eike Ziller
f901478c6a Bookmarks: Convert to Tr::tr
Change-Id: I3fd7472b731264b4399412ed36b1b9aba9b7d1c3
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
2022-07-11 07:07:40 +00:00
hjk
9894c6eaf0 Debugger: Convert to Tr::tr
Change-Id: I5d2475c790851c68f9997ac6af72b5eaca58482d
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-07-08 12:32:38 +00:00
David Schulz
8170501502 Editor: visualize indent
Paint a horizontal line every indent size in the whitespace at the start
of each block.

Fixes: QTCREATORBUG-22756
Change-Id: I044ccb4adefa4c8c9a3a610f0e996a810487fa1e
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2022-07-08 10:12:42 +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
Eike Ziller
10163afae0 Merge remote-tracking branch 'origin/8.0'
Conflicts:
	share/qtcreator/translations/qtcreator_ja.ts

Change-Id: I436b8f60971f11a5fb7962a57600ad075135f397
2022-07-08 10:21:30 +02: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
Eike Ziller
f950a5d86c Merge remote-tracking branch 'origin/8.0'
Conflicts:
	src/libs/utils/terminalprocess.cpp
	tests/auto/qml/qmldesigner/coretests/CMakeLists.txt

Change-Id: Ifc5b37dadd46af752f0771a2685da1ac9a6260bd
2022-07-07 13:47:12 +02:00
hjk
d3786a895b Debugger: Use some Tr::tr in WatchModel related classes
Change-Id: I1fcd0c5f342da4fd5ff52c19eb9f3f20a9bdcc5b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-07-07 08:52:11 +00:00
Marco Bubke
fd41105191 QmlDesigner: Introduction of PropertyMetaInfo
Because the project storage is integer id based the string based API
isn't fitting well for the new approach. PropertyMetaInfo can be easier
mapped to the project storage.

Task-number: QDS-7197
Change-Id: I49bc650abdaacf4b039d76c2514b5ad05ec84abe
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-07-06 12:40:58 +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
hjk
95c1f37a31 RemoteLinux: Reduce visibility of KillAppStep
Change-Id: Ib90a25ea5d3f2c7636aa099c87a3f71721ab9ea6
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-07-04 11:11:13 +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
Eike Ziller
91fb0cf123 Merge remote-tracking branch 'origin/8.0'
Conflicts:
	src/plugins/qmldesigner/qmldesignerprojectmanager.cpp

Change-Id: I5106bb632c2a3a144287097137be45b0894b9ee4
2022-07-04 08:53:22 +02: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
Eike Ziller
6c98721efc Merge remote-tracking branch 'origin/8.0'
Change-Id: I552d201d09d62d21655176467088c6e48b8a2fe2
2022-06-29 15:29:49 +02: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
Eike Ziller
f95a1eca34 Merge remote-tracking branch 'origin/8.0'
Change-Id: Icef5e28557701243e686d35cf885412eb341e75a
2022-06-28 11:35:16 +02: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
Eike Ziller
c7b724c4ca Merge remote-tracking branch 'origin/8.0'
Change-Id: Ia1c97d5949de607177a5a0632c7e8a37cbfd3475
2022-06-27 10:33:44 +02: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