QmlDesigner: Fix for QUL Compatibility

Fixes: QDS-3999
Fixes: QDS-4000
Fixes: QDS-4001
Change-Id: I6783b0d56dc1b8fa2da5241c302690b3743f1a7a
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>

15 files changed, 71 insertions, 60 deletions

diff --git a/src/imports/compatibility/QtQuickUltralite/Extras/designer/QtQuickUltralitePlugin.metainfo b/src/imports/compatibility/QtQuickUltralite/Extras/designer/QtQuickUltraliteExtras.metainfo
index f89a178..ad1e6c9 100644
--- a/src/imports/compatibility/QtQuickUltralite/Extras/designer/QtQuickUltralitePlugin.metainfo
+++ b/src/imports/compatibility/QtQuickUltralite/Extras/designer/QtQuickUltraliteExtras.metainfo
@@ -9,6 +9,7 @@ MetaInfo {
             libraryIcon: "images/image-icon@2x.png"
             version: "1.7"
             requiredImport: "QtQuickUltralite.Extras"
+            Property { name: "source"; type: "binding"; value: "\"source/text\""; }
         }
     }
     Type {
@@ -21,6 +22,7 @@ MetaInfo {
             libraryIcon: "images/text-icon@2x.png"
             version: "1.7"
             requiredImport: "QtQuickUltralite.Extras"
+            Property { name: "text"; type: "binding"; value: "qsTr(\"Static Text\")"; }
         }
     }
 }
diff --git a/src/imports/compatibility/QtQuickUltralite/Extras/designer/designer.pri b/src/imports/compatibility/QtQuickUltralite/Extras/designer/designer.pri
index 21f0dea..43eab31 100644
--- a/src/imports/compatibility/QtQuickUltralite/Extras/designer/designer.pri
+++ b/src/imports/compatibility/QtQuickUltralite/Extras/designer/designer.pri
@@ -1,5 +1,5 @@
 AUX_QML_FILES += \
-    $$PWD/QtQuickUltralitePlugin.metainfo
+    $$PWD/QtQuickUltraliteExtras.metainfo
 
 AUX_QML_FILES += \
     $$PWD/ColorizedImageSpecifics.qml \
diff --git a/src/imports/compatibility/QtQuickUltralite/Extras/extras.pro b/src/imports/compatibility/QtQuickUltralite/Extras/extras.pro
index 0c2f525..6061c5b 100644
--- a/src/imports/compatibility/QtQuickUltralite/Extras/extras.pro
+++ b/src/imports/compatibility/QtQuickUltralite/Extras/extras.pro
@@ -1,5 +1,5 @@
-TARGET = QtQuickUltralitePlugin
-TARGETPATH = QtQuick/Studio/Compatibility/QtQuickUltralite/Extras
+TARGET = studioqtquickultraliteextras
+TARGETPATH = QtQuickUltralite/Extras
 IMPORT_VERSION = 1.0
 
 QT += core qml quick
@@ -12,11 +12,10 @@ OTHER_FILES += \
     $$QML_FILES
 
 SOURCES += \
-    $$PWD/ultralite_plugin.cpp \
+    $$PWD/studiocompatibilityqulextras.cpp \
     $$PWD/imagechecker.cpp
 
 HEADERS += \
-    $$PWD/ultralite_plugin.h \
     $$PWD/imagechecker.h
 
 !static: qtConfig(quick-designer): include(designer/designer.pri)
diff --git a/src/imports/compatibility/QtQuickUltralite/Extras/plugins.qmltypes b/src/imports/compatibility/QtQuickUltralite/Extras/plugins.qmltypes
new file mode 100644
index 0000000..aac3a1a
--- /dev/null
+++ b/src/imports/compatibility/QtQuickUltralite/Extras/plugins.qmltypes
@@ -0,0 +1,13 @@
+import QtQuick.tooling 1.2
+
+// This file describes the plugin-supplied types contained in the library.
+// It is used for QML tooling purposes only.
+//
+// This file was auto-generated by:
+// 'qmlplugindump -nonrelocatable -dependencies dependencies.json QtQuick.Controls 2.15'
+
+Module {
+    dependencies: [
+        "QtQuick 2.11"
+    ]
+}
diff --git a/src/imports/compatibility/QtQuickUltralite/Extras/qmldir b/src/imports/compatibility/QtQuickUltralite/Extras/qmldir
index 241d5fa..cf1738a 100644
--- a/src/imports/compatibility/QtQuickUltralite/Extras/qmldir
+++ b/src/imports/compatibility/QtQuickUltralite/Extras/qmldir
@@ -1,6 +1,5 @@
 module QtQuickUltralite.Extras
-ColorizedImage 1.0 ColorizedImage.qml
-StaticText 1.0 StaticText.qml
-plugin QtQuickUltralitePlugin
-
 ColorizedImage 1.7 ColorizedImage.qml
+StaticText 1.7 StaticText.qml
+plugin studioqtquickultraliteextras
+designersupported
diff --git a/src/imports/compatibility/QtQuickUltralite/Extras/ultralite_plugin.cpp b/src/imports/compatibility/QtQuickUltralite/Extras/studiocompatibilityqulextras.cpp
index 47c8df6..60e863e 100644
--- a/src/imports/compatibility/QtQuickUltralite/Extras/ultralite_plugin.cpp
+++ b/src/imports/compatibility/QtQuickUltralite/Extras/studiocompatibilityqulextras.cpp
@@ -27,19 +27,39 @@
 **
 ****************************************************************************/
 
-#include "ultralite_plugin.h"
-
 #include "imagechecker.h"
 
 #include <QQmlEngine>
 #include <QQmlContext>
+#include <QtQml/qqmlextensionplugin.h>
+
+QT_BEGIN_NAMESPACE
+
+class StudioCompatibilityQULExtras: public QQmlExtensionPlugin
+{
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid)
+
+public:
+    StudioCompatibilityQULExtras(QObject *parent = nullptr);
+    void registerTypes(const char *uri) override;
+};
+
+StudioCompatibilityQULExtras::StudioCompatibilityQULExtras(QObject *parent)
+    : QQmlExtensionPlugin(parent)
+{
+}
 
 static QObject *imageCheckerSingletonTypeProvider(QQmlEngine *, QJSEngine *)
 {
     return ImageChecker::getInstance();
 }
 
-void UltralitePlugin::registerTypes(const char *uri)
+void StudioCompatibilityQULExtras::registerTypes(const char *uri)
 {
     qmlRegisterSingletonType<ImageChecker>(uri, 1, 0, "ImageChecker", imageCheckerSingletonTypeProvider);
 }
+
+QT_END_NAMESPACE
+
+#include "studiocompatibilityqulextras.moc"
diff --git a/src/imports/compatibility/QtQuickUltralite/Extras/ultralite_plugin.h b/src/imports/compatibility/QtQuickUltralite/Extras/ultralite_plugin.h
deleted file mode 100644
index 2c6c2f8..0000000
--- a/src/imports/compatibility/QtQuickUltralite/Extras/ultralite_plugin.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2021 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of Qt Quick Ultralite compatibility.
-**
-** $QT_BEGIN_LICENSE:GPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 or (at your option) any later version
-** approved by the KDE Free Qt Foundation. The licenses are as published by
-** the Free Software Foundation and appearing in the file LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#pragma once
-
-#include <QQmlExtensionPlugin>
-
-class UltralitePlugin : public QQmlExtensionPlugin
-{
-    Q_OBJECT
-    Q_PLUGIN_METADATA(IID "com.theqtcompany.qul.extras")
-
-public:
-    void registerTypes(const char *uri) override;
-};
diff --git a/src/imports/compatibility/QtQuickUltralite/Layers/ItemLayer.qml b/src/imports/compatibility/QtQuickUltralite/Layers/ItemLayer.qml
index 79fdfb9..231c3d3 100644
--- a/src/imports/compatibility/QtQuickUltralite/Layers/ItemLayer.qml
+++ b/src/imports/compatibility/QtQuickUltralite/Layers/ItemLayer.qml
@@ -42,7 +42,7 @@ Item {
     }
 
     property int depth: ColorDepth.Bpp32
-    property int refreshInterval: 0
+    property int refreshInterval: 1
     property int platformId: 0
     property int renderingHints: RenderingHints.OptimizeForSpeed
 }
diff --git a/src/imports/compatibility/QtQuickUltralite/Layers/SpriteLayer.qml b/src/imports/compatibility/QtQuickUltralite/Layers/SpriteLayer.qml
index 214afbe..8a0248f 100644
--- a/src/imports/compatibility/QtQuickUltralite/Layers/SpriteLayer.qml
+++ b/src/imports/compatibility/QtQuickUltralite/Layers/SpriteLayer.qml
@@ -35,7 +35,7 @@ Item {
          Bpp16, Bpp16Alpha, Bpp24, Bpp32, Bpp32Alpha
      }
 
-    property int depth: ColorDepth.Bpp32
+    property int depth: ColorDepth.Bpp32Alpha
     property int platformId: 0
 }
 //! [SpriteLayer compatibility]
diff --git a/src/imports/compatibility/QtQuickUltralite/Layers/designer/ImageLayerSpecifics.qml b/src/imports/compatibility/QtQuickUltralite/Layers/designer/ImageLayerSpecifics.qml
index ac9ff93..6bac0f6 100644
--- a/src/imports/compatibility/QtQuickUltralite/Layers/designer/ImageLayerSpecifics.qml
+++ b/src/imports/compatibility/QtQuickUltralite/Layers/designer/ImageLayerSpecifics.qml
@@ -68,7 +68,7 @@ Column {
                     model: ["OptimizeForSpeed", "OptimizeForSize", "StaticContents"]
                     backendValue: backendValues.renderingHints
                     Layout.fillWidth: true
-                    scope: "RenderingHints"
+                    scope: "ImageLayer"
                 }
             }
 
diff --git a/src/imports/compatibility/QtQuickUltralite/Layers/designer/ItemLayerSpecifics.qml b/src/imports/compatibility/QtQuickUltralite/Layers/designer/ItemLayerSpecifics.qml
index a61009d..8f2636f 100644
--- a/src/imports/compatibility/QtQuickUltralite/Layers/designer/ItemLayerSpecifics.qml
+++ b/src/imports/compatibility/QtQuickUltralite/Layers/designer/ItemLayerSpecifics.qml
@@ -68,7 +68,7 @@ Column {
                     model: ["OptimizeForSpeed", "OptimizeForSize", "StaticContents"]
                     backendValue: backendValues.renderingHints
                     Layout.fillWidth: true
-                    scope: "RenderingHints"
+                    scope: "ItemLayer"
                 }
             }
 
diff --git a/src/imports/compatibility/QtQuickUltralite/Layers/designer/QtQuickUltraliteLayers.metainfo b/src/imports/compatibility/QtQuickUltralite/Layers/designer/QtQuickUltraliteLayers.metainfo
index 0f84370..51dc943 100644
--- a/src/imports/compatibility/QtQuickUltralite/Layers/designer/QtQuickUltraliteLayers.metainfo
+++ b/src/imports/compatibility/QtQuickUltralite/Layers/designer/QtQuickUltraliteLayers.metainfo
@@ -21,6 +21,7 @@ MetaInfo {
             libraryIcon: "images/item-icon@2x.png"
             version: "1.7"
             requiredImport: "QtQuickUltralite.Layers"
+            Property { name: "renderingHints"; type: "enum"; value: "ImageLayer.OptimizeForSpeed"; }
         }
     }
     Type {
@@ -33,6 +34,9 @@ MetaInfo {
             libraryIcon: "images/item-icon@2x.png"
             version: "1.7"
             requiredImport: "QtQuickUltralite.Layers"
+            Property { name: "depth"; type: "enum"; value: "ItemLayer.Bpp32"; }
+            Property { name: "renderingHints"; type: "enum"; value: "ItemLayer.OptimizeForSpeed"; }
+            Property { name: "refreshInterval"; type: "int"; value: 1; }
         }
     }
     Type {
@@ -57,6 +61,7 @@ MetaInfo {
             libraryIcon: "images/item-icon@2x.png"
             version: "1.7"
             requiredImport: "QtQuickUltralite.Layers"
+            Property { name: "depth"; type: "enum"; value: "SpriteLayer.Bpp32Alpha"; }
         }
     }
 }
diff --git a/src/imports/compatibility/QtQuickUltralite/Layers/layers.pro b/src/imports/compatibility/QtQuickUltralite/Layers/layers.pro
index 74f5cf8..17a51d5 100644
--- a/src/imports/compatibility/QtQuickUltralite/Layers/layers.pro
+++ b/src/imports/compatibility/QtQuickUltralite/Layers/layers.pro
@@ -1,5 +1,5 @@
-TARGET = studiocompatibilityqullayers
-TARGETPATH = QtQuick/Studio/Compatibility/QtQuickUltralite/Layers
+TARGET = studioqtquickultralitelayers
+TARGETPATH = QtQuickUltralite/Layers
 IMPORT_VERSION = 1.0
 
 QT += qml quick
@@ -16,7 +16,7 @@ OTHER_FILES += \
 SOURCES += \
     $$PWD/studiocompatibilityqullayers.cpp
 
-#!static: qtConfig(quick-designer): include(designer/designer.pri)
+!static: qtConfig(quick-designer): include(designer/designer.pri)
 ## include(doc/doc.pri)
 
 CONFIG += no_cxx_module install_qml_files qtquickcompiler
diff --git a/src/imports/compatibility/QtQuickUltralite/Layers/plugins.qmltypes b/src/imports/compatibility/QtQuickUltralite/Layers/plugins.qmltypes
new file mode 100644
index 0000000..aac3a1a
--- /dev/null
+++ b/src/imports/compatibility/QtQuickUltralite/Layers/plugins.qmltypes
@@ -0,0 +1,13 @@
+import QtQuick.tooling 1.2
+
+// This file describes the plugin-supplied types contained in the library.
+// It is used for QML tooling purposes only.
+//
+// This file was auto-generated by:
+// 'qmlplugindump -nonrelocatable -dependencies dependencies.json QtQuick.Controls 2.15'
+
+Module {
+    dependencies: [
+        "QtQuick 2.11"
+    ]
+}
diff --git a/src/imports/compatibility/QtQuickUltralite/Layers/qmldir b/src/imports/compatibility/QtQuickUltralite/Layers/qmldir
index def13ef..22a8eee 100644
--- a/src/imports/compatibility/QtQuickUltralite/Layers/qmldir
+++ b/src/imports/compatibility/QtQuickUltralite/Layers/qmldir
@@ -4,3 +4,4 @@ Screen 1.7 Screen.qml
 ImageLayer 1.7 ImageLayer.qml
 ItemLayer 1.7 ItemLayer.qml
 SpriteLayer 1.7 SpriteLayer.qml
+designersupported