Commit Graph

15 Commits

Author SHA1 Message Date
hjk
e98c523b3f QmlDesigner: Fix a few more Qt deprecation related warnings
Change-Id: I245693e0aa58454f631b9150cd86f3034c5cfbe6
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-06-09 07:57:24 +00:00
Marco Bubke
6035ff939d QmlDesigner: Add module scanner
For performance reason we want to get the qml modules directly from the
file system. When the project storage is finished we can get the modules
from there.

Task-number: QDS-9542
Change-Id: I26d4b028fbf5ebc541fcd8e34d285ded1fb14935
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-04-19 13:58:22 +00:00
Tim Jenßen
feabda3aa7 Merge remote-tracking branch 'origin/10.0' into qds/dev
bigger conflicts resolved at:
  src/plugins/qmldesigner/CMakeLists.txt
  src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp

Change-Id: I08e2a109d8e37cbd77225129854e9e633725bfc7
2023-03-26 16:26:18 +02:00
Mahmoud Badri
cd70e9cecb QmlDesigner: Move connection classes out of Internal
Also clean up DynamicPropertiesProxyModel and DynamicPropertiesModel
classes.

Change-Id: I40a2864c1ffbd555dfea9452cd55bbeb23e9fdfa
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-03-16 16:49:34 +00:00
Miikka Heikkinen
c14ec1b4c1 QmlDesigner: Don't create material library node in in-file component
While there are some valid use cases for having a material library
inside in-file component, having duplicate material library nodes
in a single file causes some issues that are not trivial to solve,
so for now we just prevent this from happening.

Fixes: QDS-8656
Change-Id: I4495ea4d972eab76ca444d18ab4c45b403805ad7
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-01-31 14:40:49 +00:00
Thomas Hartmann
8d02bbf075 QmlDesigner: Add display name more feedback popup
Task-number: QDS-8870
Change-Id: Id8d1c98dec71e962b63a144c234642417e1df602
Reviewed-by: Mats Honkamaa <mats.honkamaa@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-01-23 15:12:20 +00:00
Kai Köhne
56baf8c058 Remove GPL-3.0+ from license identifiers
Since we also license under GPL-3.0 WITH Qt-GPL-exception-1.0,
this applies only to a hypothetical newer version of GPL, that doesn't
exist yet. If such a version emerges, we can still decide to relicense...

While at it, replace (deprecated) GPL-3.0 with more explicit GPL-3.0-only

Change was done by running

  find . -type f -exec perl -pi -e "s/LicenseRef-Qt-Commercial OR GPL-3.0\+ OR GPL-3.0 WITH Qt-GPL-exception-1.0/LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0/g" {} \;

Change-Id: I5097e6ce8d10233993ee30d7e25120e2659eb10b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-01-06 11:15:13 +00:00
Mahmoud Badri
e70f909bcf QmlDesigner: Update texture editor and browser after source reset
Fixes: QDS-8520
Change-Id: I9ceca64d75ef1c41633a89a79748265beecd16ea
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Ali Kianian <ali.kianian@qt.io>
2022-12-08 11:32:08 +00:00
Miikka Heikkinen
ddecd338a8 QmlDesigner: Unify texture image providers
Texture editor, material browser, and UrlChooser all had separate
texture providers that served nearly identical purpose.
Unified all use cases to use same PropertyEditorImageProvider.
This provider is asynchronous, which combined with enabling caching on
Image elements, significantly improves responsiveness of the material
browser UI when there are many textures shown in the browser.

Fixes: QDS-8387
Change-Id: I2888aee2f4320dba9456fa046c9ede319673a3d9
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-11-25 15:31:04 +00:00
Samuel Ghinet
907a64ac32 Fix bug: drag state remain on after dragging asset to texture
Task-number: QDS-8341
Change-Id: If9bc7c0e3f2e017df4fde2cf94e7ffc168644eef
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-11-25 14:27:03 +00:00
Samuel Ghinet
45c7a6b8e6 Implement drag-and-drop from Assets View to Texture Editor
The asset (i.e. image) can now be dragged to the "Source" property of
the Texture Editor.

Task-number: QDS-8341
Change-Id: I2d30bdf245a8328a864c116c727d3faaaad347cc
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-11-25 10:57:55 +00:00
Mahmoud Badri
34b236e7fb QmlDesigner: Disable assigning a texture to a model with no materials
Disable apply texture to selected model option from texture editor's
toolbar when the selected model has no material. Also relevant fixes
to make sure texture assigning happens in the current state.

Fixes: QDS-8395
Change-Id: Iab2e8fce4696c6bd5d50636b4077362ba04cb8a0
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-11-24 10:45:57 +00:00
Mahmoud Badri
6943322b42 QmlDesigner: Suppress some unused params warnings
Change-Id: Ib54014fdc6d1256393e60b2d2df17fa3cd4573e4
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-11-24 08:54:46 +00:00
Miikka Heikkinen
ac1af9a582 Implement texture context menu
Apply to selected model/material, delete, duplicate, and
create new options are available in the menu.

Fixes: QDS-8342
Change-Id: Ib9bdc1738500a87361000bcd3e89403e3b8ccef8
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-11-22 10:44:36 +00:00
Mahmoud Badri
815dd39e47 QmlDesigner: Implement Texture Editor view
Fixes: QDS-8209
Change-Id: Ief0c9f56da79841c745595024dbcd9219072b681
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-11-21 10:16:33 +00:00