Commit Graph

7285 Commits

Author SHA1 Message Date
The Qt Project
f56420ee07 Merge "Merge remote-tracking branch 'origin/9.0' into qds/dev" into qds/dev 2022-11-09 15:42:39 +00:00
Tim Jenssen
f8c99ebd9a Merge remote-tracking branch 'origin/9.0' into qds/dev
Change-Id: I02fd6f492c27d85b88af7ec8bc18ff62f2c6ed14
2022-11-09 16:41:12 +01:00
Marco Bubke
63022d08ea QmlDesigner: QmlPuppet as standalone tool
The qmlpuppet is now a standalone tool. There is new a library too with
the communication code. That is shared between the designer and the
puppet. It's in a .cmake file so it can be included by the standalone
tool if it is not part of a designer build.

Task-number: QDS-5879
Change-Id: I2bc2a0b463fbb3e0c8c23d182abfd368cf87e968
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-11-09 12:29:38 +00:00
Eike Ziller
b038ea3a40 Fix debugging with LLDB
Broke with bb11788a0a

Change-Id: Ie02a36b98be83bd4721eacc834321a5494c584a3
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-11-09 11:47:52 +00:00
Tim Jenssen
63d3a6bd3d Merge remote-tracking branch 'origin/8.0' into 9.0
Conflicts:
  src/plugins/qmldesigner/components/assetslibrary/assetslibrarywidget.cpp
  src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp
  src/plugins/qmldesigner/qmldesignerplugin.cpp

Change-Id: I24216ae3f83cdde3493b4a6274e24a72f75820fc
2022-11-09 11:45:25 +01:00
Eike Ziller
df946c77dc Chinese translation: Run lupdate for qtcreator_zh_CN.ts
in preparation for the translation. Result of
`lupdate . -no-obsolete -no-ui-lines -locations none
 -ts share/qtcreator/translations/qtcreator_zh_CN.ts`

Change-Id: I1e7389aae93f1aee8594f35e53531ee53e5f0ed6
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Xu Shitong <xushitong@uniontech.com>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-11-09 07:03:20 +00:00
hjk
bb11788a0a Debugger: Avoid quadratic behavior for larger debug output
Task-number: QTCREATORBUG-28111
Change-Id: I0567b6af9f74c2d335d19a52765834ef7cee9449
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-11-08 13:53:30 +00:00
Miikka Heikkinen
d9d4d1829a QmlDesigner: Fix material name editing issues
Material name field in material browser now ensures that the start
of the string is visible when editing is not focused.

Any click outside the name field will take the focus away from the
field, and name field state is properly updated when focus goes
away for any reason.

Trying to set same name as before is ignored instead of changing the
name to <oldName>1.

Fixes: QDS-8185
Change-Id: I723e3ae312e3e2c4ce8a95a3b05effcee2bae328
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-11-08 12:21:06 +00:00
Eike Ziller
56bc91d0d8 German translation: Welcome plugin
Change-Id: I8d50831e3fc20364c4738c0fe64ca2feacf72c41
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2022-11-08 10:56:50 +00:00
Eike Ziller
48c7e78e01 German translation: TextEditor plugin
Change-Id: Ie4dfe8001ecb51e7f012080230da0ca4c0ccd56f
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2022-11-08 10:56:26 +00:00
Mahmoud Badri
15dd073e0c QmlDesigner: Add basic drag-n-drop support to textures
Dropping textures to different views to be handled separately.

Change-Id: I1e0ac5681e5e1b3dca8bdaf6819a6b699f629e79
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-11-08 10:22:53 +00:00
Mahmoud Badri
d5a7f25e60 QmlDesigner: Implement content library view
Fixes: QDS-8058
Fixes: QDS-8059
Change-Id: I1adfdc7ac15141e010467813ec6e673060269241
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-11-08 10:04:43 +00:00
Eike Ziller
9eebcf3ef0 Restrict Python application wizards to desktop
Fixes: QTCREATORBUG-28258
Change-Id: I9814abe093efbff0b7b15711d4773c8cbcdc8e41
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-11-07 13:56:55 +00:00
Eike Ziller
5335de2669 German translation: ExtensionSystem
Change-Id: Ia74823094434138889bf6699283e183a925584bf
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2022-11-07 06:50:08 +00:00
Eike Ziller
7203d6d44b German translation: Bookmarks
Change-Id: I4ee0d059d30b99742a1706e6e5769e71251ae6b7
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2022-11-04 12:17:18 +00:00
Eike Ziller
ead9dd987f German translation: Core plugin
Change-Id: Iec22406e32a21c58629889361fba22f0278da5b1
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2022-11-04 10:54:21 +00:00
Eike Ziller
935f2e5d5e German translation: Help plugin
Change-Id: I555c20649ed838c08a074c76f78ba10a310c53a9
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2022-11-04 10:53:52 +00:00
Eike Ziller
e19c80b2c0 German translation: UpdateInfo plugin
Change-Id: I0dc74089a67245d2c7ec1ebcaf17acd848625037
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2022-11-04 10:53:36 +00:00
Eike Ziller
6401479dfd German translation: lupdate ts file
Result of `cmake --build . --target ts_de_cleaned` in the build
directory, in preparation for translations.

Change-Id: I9cf3b1aa08244e157e784ae148ed9b1dd308adb5
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2022-11-04 10:53:20 +00:00
Tim Jenssen
40072fb5c7 Merge remote-tracking branch 'origin/9.0' into qds/dev
Change-Id: I5f72661f1fc54ff861e2cbbaa4cb32f867924c3b
2022-11-03 15:32:29 +01:00
Thomas Hartmann
318a2aff2f QmlDesigner: Enforce rules for QML component names
Since a QML component is generated from the effect,
the same rules for names should apply.

Task-number: QDS-8152
Change-Id: I607c2771401fec2259b1e1aac9a37707aa1328b7
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2022-11-03 10:54:18 +00:00
Thomas Hartmann
7b9303007a QmlDesigner: Avoid error messages when adding effect
* Removing the summary page
* Adding DoNotOpenFile option

By default, the wizard expects to open a file.
Setting DoNotOpenFile to true does suppress this.

Task-number: QDS-8151
Change-Id: I62264733788dbbe1b017beaa428356548a1a3692
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2022-11-03 10:53:50 +00:00
Thomas Hartmann
73cdb6239d QmlDesigner: Show Effect wizard only in enterprise version
Change-Id: If0c99beec083514ed5c531bb7a67cd7a392c3108
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2022-11-02 12:44:56 +00:00
Thomas Hartmann
b1c48a27c0 QmlDesigner: Move effect wizard to qmldesigner/studio_templates
This is the folder QDS looks for the wizards.

Change-Id: Id69f50f48eeb4668dff2840a36149408e0709a06
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-11-01 19:14:08 +00:00
Eike Ziller
b402f35481 Merge remote-tracking branch 'origin/8.0' into 9.0
Conflicts:
	doc/qtcreator/src/qtquick/qt-design-viewer.qdoc
	src/plugins/qmldesigner/components/assetslibrary/assetslibrarywidget.cpp
	src/plugins/qmldesigner/components/edit3d/edit3dwidget.cpp
	src/plugins/qmldesigner/components/materialbrowser/materialbrowserview.cpp
	src/plugins/qmldesigner/components/navigator/choosefrompropertylistdialog.cpp
	src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp
	src/plugins/qmldesigner/designercore/model/abstractview.cpp
	src/plugins/qmldesigner/designercore/model/import.cpp
	src/plugins/qmldesigner/designercore/model/model_p.h
	src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
	src/plugins/qmlprojectmanager/qmlproject.cpp

Change-Id: I4236bf0da9306abf201f4679259e72dd7c1eddbe
2022-11-01 15:38:49 +01:00
Tomi Korpipaa
02f7c9c3eb Import QQEM effects via drag or add button
Be able to add effects using file system drag&drop or using the add resource button

Task-number: QTBUG-100626
Change-Id: I33c3ebe29797325a2ed1819bd867e97ae3f8b61c
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-11-01 12:55:28 +00:00
Rainer Keller
b23d066f9d McuSupport: Remove ASM_MASM from CMake project languages
This was never required and was added to the list by accident.

Task-number: UL-5875
Change-Id: I7957d49e9c87da91a81a363185f11e8331c650c3
Reviewed-by: Daniele Bortolotti <daniele.bortolotti@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-11-01 07:46:41 +00:00
Alessandro Portale
ce89ee59c5 Translations: Remove duplicates
Amends: 698583dc01

Change-Id: Ia3dfa1743b9959c85cd09b59c3ca08b82c18fa0e
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-10-31 10:32:20 +00:00
Mahmoud Badri
2a4de97a84 QmlDesigner: Fix toggle section expand after choosing expand all
Fixes: QDS-8104
Change-Id: I6191a7b249490e6193acdd8b618c0817a3fc6ab3
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-10-28 08:20:26 +00:00
Tim Jenssen
ad3169bedd qds: fix mobile scroll projects template
I guess this was removed by accident at
d99a6d2efe
so I just adding it back now.

Task-number: QDS-8111
Change-Id: Ib42ce5cc0cf13608f07b0671adce149c15878ef0
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
2022-10-27 15:06:40 +00:00
Thomas Hartmann
ed0727e88f QmlDesigner: Add option for Qt 6.4
Change-Id: I7548a680a5773d7d2799fa5998bdc0956fb2e9c2
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-10-26 14:05:17 +00:00
Tim Jenssen
aa33927651 Merge remote-tracking branch 'origin/9.0'
Conflicts:
	src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp
	src/plugins/qmldesigner/components/stateseditornew/propertychangesmodel.cpp
	src/plugins/qmldesigner/components/stateseditornew/propertymodel.cpp
	src/plugins/qmldesigner/qmldesignerprojectmanager.cpp
	src/plugins/qmldesigner/qmldesignerprojectmanager.h

Change-Id: Ib029a830ee99190bc4ea2ad75d9300bfa86b42d9
2022-10-25 19:02:15 +02:00
Miikka Heikkinen
8da35bac0f QmlDesigner: Add support for SpecularGlossyMaterial
Task-number: QDS-8087
Change-Id: Ic5cdca5d61d5f4ad11f63f3f5a59907798cde763
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-10-25 15:06:35 +00:00
Thomas Hartmann
f8a272e076 QmlDesigner: Bump QDS version in .qmlproject
Change-Id: I39cefcd5c1a16fd56eb05c485eeb11471683aeec
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2022-10-25 14:45:43 +00:00
Thomas Hartmann
0e7bb80408 QmlDesigner: Use QML_COMPAT_RESOLVE_URLS_ON_ASSIGNMENT
At least for now this is the better default for QDS.
See also for example the SafeRenderer items.

Task-number: QDS-4812
Change-Id: I03d614ec52c1e5ab11576bbfdaa3bad0d72f0fbf
Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
2022-10-25 09:11:07 +00:00
Leena Miettinen
51c1accfa5 Qt Quick Designer: Fix references to changed view names in UI text
- Form Editor > 2D
- 3D Editor > 3D
- Text Editor > Code

Task-number: QTCREATORBUG-28334
Change-Id: I65f693b47b1c361dae3c270333ff036e4c473b9e
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-10-24 08:17:17 +00:00
Thomas Hartmann
7092d8da22 QmlDesigner: Fix ColorEditorPopup on Qt 6.4
With Qt 6.4 the position of the loader is not set to 0 by default.
Using anchors does fix this.

Task-number: QDS-8018
Change-Id: I74623cff1f02968515fe7452cc770534f43c2d77
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
2022-10-21 15:28:26 +00:00
Eike Ziller
698583dc01 Translations: Get some translations for Text Editor settings back
Display, font and tab settings.
No idea when that broke, but it is trivial to get back.

Change-Id: I96b809cb40c899bb62ddeaab03343181826930a8
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-10-21 13:59:24 +00:00
Eike Ziller
7e60e6197a TextEditor: Fix wrong space in behavior settings
German translation done separately

Change-Id: I746ab8455109d83ca69c0add0a8d9e34555bea18
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2022-10-21 12:44:04 +00:00
Mahmoud Badri
bad166cda8 QmlDesigner: Maintain bundle categories expand state
Prevent categories auto-expanding when adding an bundle material
instance. Also some relevant tweaks.

Fixes: QDS-8043
Change-Id: Id87886c6d6e065f2c9c1253279348e076bc4d97f
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-10-21 10:00:01 +00:00
Mahmoud Badri
2ccc4a03ed Revert "QmlDesigner: Add "imported" icon to the icons font"
This reverts commit b0fa747565.

Reason for revert: imported icon not needed anymore. also removed icons are needed.

Change-Id: I2d3423a585358abd760f55bba1215d6d2878fdc1
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-10-21 09:40:44 +00:00
Eike Ziller
8beb1fe775 Merge remote-tracking branch 'origin/8.0' into 9.0
Change-Id: Icd606068e77d6845cbbda5d48eda477cb21a312f
2022-10-21 10:03:56 +02:00
Mahmoud Badri
70f532c43f QmlDesigner: Allow drag-n-drop a bundle material to materials section
Fixes: QDS-8041
Change-Id: I848f636f41c58e11c719517f4073243a76e293b6
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-10-20 16:35:27 +00:00
Eike Ziller
57a3afbb70 Merge remote-tracking branch 'origin/8.0' into 9.0
Conflicts:
	src/plugins/qmldesigner/components/timelineeditor/easingcurvedialog.cpp

Change-Id: I435b955899fcc70faaec6332de55283cf16b694f
2022-10-20 15:28:23 +02:00
Eike Ziller
7b449c9463 Merge commit '029f926bcfcbb01' (origin/8.0) into 9.0
Conflicts:
	src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp
	src/plugins/qmldesigner/qmldesignerprojectmanager.cpp

Change-Id: Iff498a1024f4a152ebdd3516ba13fa16cb6932d9
2022-10-20 15:01:00 +02:00
Henning Gruendl
cf9b36a6c7 QmlDesigner: Use AUX property to remember state
Use AUX properties to save the StateThumbnail state (property changes or
thumbnail). Also the save the state of the property changes state
section (expanded or collapsed).

Task-number: QDS-7732
Change-Id: I607bb05b7c71bb98e7781d058bb5736ab4b77e72
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-10-20 12:10:25 +00:00
Henning Gruendl
ac0251e106 QmlDesigner: Block DragHandler when menu open
Task-number: QDS-7851
Change-Id: Ia48e326c1f33d7b405eb2f93936e3aa99f0a9e60
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-10-20 12:09:14 +00:00
Leena Miettinen
c4ac5e414a UI text: Use a full stop in the end of messages
And fix the capitalization of some message box titles.

Task-number: QTCREATORBUG-28334
Change-Id: I858eefd5a12494723c40e0253a3708fa77284d1b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-10-20 09:25:08 +00:00
Thomas Hartmann
e2706436a9 QmlDesigner: Fix Q_ASSERT
instanceForObject(item) will assert if the instance does not
exist. We already do check if the instance is actually valid.

Change-Id: I0b0ef37d7db3d1e4195504ee8e5f92243bb26d83
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-10-20 08:19:15 +00:00
Leena Miettinen
7c9d1ef516 UI text: Fix UI text to follow the guidelines
- Fix typos
- Replace "options" with "preferences"
- Fix capitalization
- Remove "please"
- Do not use contractions

Task-number: QTCREATORBUG-28334
Change-Id: Ie029eae435634aa2fb354e173fa107af72f7b025
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-10-20 07:38:32 +00:00