Commit Graph

7 Commits

Author SHA1 Message Date
Miikka Heikkinen
bc370aecfd QmlDesigner: Hide material bundle if QtQuick3D version too low
Most materials in the material bundle require at least QtQuick3D 6.3,
so we hide the bundle materials from material browser when the detected
module version is less than 6.3.

Fixes: QDS-8100
Change-Id: I9f50b507c3c3c50f821fa6a902995b999da24464
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-10-27 14:35:07 +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
b983b8aa52 QmlDesigner: Implement unimporting bundle materials
Fixes: QDS-7904
Change-Id: I08642c25a2844547d0104a7b3d9fda6afe47cd38
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-10-17 08:05:50 +00:00
Mahmoud Badri
70c4acae67 QmlDesigner: Avoid duplicate bundle material instance creation
When apply a material from the material bundle directly to a model in
the 3D scene, check frist if there is an existing material that has no
properties set, if so apply it instead of creating a new instance.
Also few tweaks.

Change-Id: I4ddadfd84442164b671645af5e4f5d9e8dcb7cb0
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-09-22 13:31:17 +00:00
hjk
9ac27ad8aa QmlDesigner: Compile fix after source-incompatible changes in Qt
The use of 'auto' here is the simplest way out and should not be
taked a precedence for other code.

Change-Id: I4435e7211139bccfca4b10ed2407ba39afe0b400
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
(cherry picked from commit b852886763)
Reviewed-by: hjk <hjk@qt.io>
2022-09-22 09:18:56 +00:00
Mahmoud Badri
6d2806c6ed QmlDesigner: Search for material bundle folder near executable
Fixes: QDS-7717
Change-Id: I33405d0be6d55550d79fc371c6d82760ec6fa5b3
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-09-20 14:24:29 +00:00
Mahmoud Badri
d9f07e95b5 QmlDesigner: Implement material bundle frontend
Fixes: QDS-7500
Change-Id: I60c512bb7664d13160f8c58ce063e1e87b6875ee
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-09-20 12:30:47 +00:00