diff options
| author | Aleksei German <aleksei.german@qt.io> | 2023-06-06 14:54:39 +0200 |
|---|---|---|
| committer | Aleksei German <aleksei.german@qt.io> | 2023-06-06 15:19:27 +0200 |
| commit | 89b9b0945fbb597205c8c8c9ffabb1b0f4368fbc (patch) | |
| tree | 9daca92b1fdf45a27b78d90a365d93426deeab08 | |
| parent | 36941ab4a1d795bfd1a3535fe8f4a84dfd4060b1 (diff) | |
Fix QUL plugins import versions
Fix generation of qmldir files from CMakeLists to allow import 1.0,
import 2.0 or qt6-style imports
Task-number: QDS-10050
Change-Id: I1ed51a46fb869c3dd684b9af81c7994e5de8b815
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
| -rw-r--r-- | src/imports/compat/Extras/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/imports/compat/Extras/qmldir | 11 | ||||
| -rw-r--r-- | src/imports/compat/Layers/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/imports/compat/Layers/qmldir | 11 |
4 files changed, 28 insertions, 2 deletions
diff --git a/src/imports/compat/Extras/CMakeLists.txt b/src/imports/compat/Extras/CMakeLists.txt index accfe1d..2e45bf0 100644 --- a/src/imports/compat/Extras/CMakeLists.txt +++ b/src/imports/compat/Extras/CMakeLists.txt @@ -3,7 +3,9 @@ qt_internal_add_qml_module(QuickUltraLiteStudioExtras VERSION "${PROJECT_VERSION}" DESIGNER_SUPPORTED NO_SYNC_QT - PAST_MAJOR_VERSIONS 1 + PAST_MAJOR_VERSIONS + 1 + 2 QML_FILES AnimatedSpriteDirectory.qml ColorizedImage.qml diff --git a/src/imports/compat/Extras/qmldir b/src/imports/compat/Extras/qmldir index 3b6b009..cb538c9 100644 --- a/src/imports/compat/Extras/qmldir +++ b/src/imports/compat/Extras/qmldir @@ -1,11 +1,22 @@ module QtQuickUltralite.Extras +designersupported linktarget studioqtquickultraliteextrasplugin optional plugin studioqtquickultraliteextrasplugin classname QtQuickUltralite_ExtrasPlugin typeinfo studioqtquickultraliteextras.qmltypes prefer :/QtQuickUltralite/Extras/ AnimatedSpriteDirectory 1.0 AnimatedSpriteDirectory.qml +AnimatedSpriteDirectory 2.0 AnimatedSpriteDirectory.qml +AnimatedSpriteDirectory 6.0 AnimatedSpriteDirectory.qml ColorizedImage 1.0 ColorizedImage.qml +ColorizedImage 2.0 ColorizedImage.qml +ColorizedImage 6.0 ColorizedImage.qml ItemBuffer 1.0 ItemBuffer.qml +ItemBuffer 2.0 ItemBuffer.qml +ItemBuffer 6.0 ItemBuffer.qml StaticText 1.0 StaticText.qml +StaticText 2.0 StaticText.qml +StaticText 6.0 StaticText.qml singleton QulPerf 1.0 QulPerf.qml +singleton QulPerf 2.0 QulPerf.qml +singleton QulPerf 6.0 QulPerf.qml diff --git a/src/imports/compat/Layers/CMakeLists.txt b/src/imports/compat/Layers/CMakeLists.txt index 1903505..183636d 100644 --- a/src/imports/compat/Layers/CMakeLists.txt +++ b/src/imports/compat/Layers/CMakeLists.txt @@ -3,7 +3,9 @@ qt_internal_add_qml_module(QuickUltraLiteStudioLayers VERSION "${PROJECT_VERSION}" DESIGNER_SUPPORTED NO_SYNC_QT - PAST_MAJOR_VERSIONS 1 + PAST_MAJOR_VERSIONS + 1 + 2 QML_FILES Application.qml ImageLayer.qml diff --git a/src/imports/compat/Layers/qmldir b/src/imports/compat/Layers/qmldir index 2c2c3ec..0968b7e 100644 --- a/src/imports/compat/Layers/qmldir +++ b/src/imports/compat/Layers/qmldir @@ -1,11 +1,22 @@ module QtQuickUltralite.Layers +designersupported linktarget studioqtquickultralitelayersplugin optional plugin studioqtquickultralitelayersplugin classname QtQuickUltralite_LayersPlugin typeinfo studioqtquickultralitelayers.qmltypes prefer :/QtQuickUltralite/Layers/ Application 1.0 Application.qml +Application 2.0 Application.qml +Application 6.0 Application.qml ImageLayer 1.0 ImageLayer.qml +ImageLayer 2.0 ImageLayer.qml +ImageLayer 6.0 ImageLayer.qml ItemLayer 1.0 ItemLayer.qml +ItemLayer 2.0 ItemLayer.qml +ItemLayer 6.0 ItemLayer.qml Screen 1.0 Screen.qml +Screen 2.0 Screen.qml +Screen 6.0 Screen.qml SpriteLayer 1.0 SpriteLayer.qml +SpriteLayer 2.0 SpriteLayer.qml +SpriteLayer 6.0 SpriteLayer.qml |