Eike Ziller
7eaa36e6e5
Merge remote-tracking branch 'origin/8.0' into 9.0
...
Conflicts:
src/plugins/qmldesigner/components/materialbrowser/materialbrowserview.cpp
src/plugins/qmldesigner/designercore/imagecache/meshimagecachecollector.cpp
Change-Id: I38f196e8f42cf11f7b613e7a723745600e35c5e9
2022-09-27 10:03:37 +02:00
Miikka Heikkinen
3d672dbf16
QmlDesigner: Fix material 2D view preview for material root components
...
Change-Id: I7930e5087014b47ccc054109cbb607ef9c373515
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io >
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org >
2022-09-23 14:12:15 +00:00
Lucie Gérard
a7956df3ca
Use SPDX license identifiers
...
Replace the current license disclaimer in files by
a SPDX-License-Identifier.
Task-number: QTBUG-67283
Change-Id: I708fd1f9f2b73d60f57cc3568646929117825813
Reviewed-by: Eike Ziller <eike.ziller@qt.io >
2022-08-26 12:27:18 +00:00
Miikka Heikkinen
d92bdcce40
QmlDesigner: Show form editor preview for 3D material root nodes
...
Fixes: QDS-6561
Change-Id: I62a06eb6c83b0a4813a1b20f91b09e17b04a1332
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io >
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org >
Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io >
Reviewed-by: <github-actions-qt-creator@cristianadam.eu >
2022-05-27 08:49:14 +00:00
