finish up qml exposure

Author: sithlord48

demos/ff7tkQmlGallery/main.cpp

@@ -26,17 +26,19 @@ int main(int argc, char *argv[])
 {
     QGuiApplication app(argc, argv);
 
-        qmlRegisterSingletonType<FF7Text>("org.ff7tk", 1, 0, "FF7Text", [](QQmlEngine *engine, QJSEngine *jsEngine) -> QObject * {
+    qmlRegisterSingletonType<FF7Text>("org.ff7tk", 1, 0, "FF7Text", [](QQmlEngine *engine, QJSEngine *jsEngine) -> QObject * {
         return FF7Text::qmlSingletonRegister(engine, jsEngine);
     });
 
     qmlRegisterSingletonType<FF7Item>("org.ff7tk", 1, 0, "FF7Item", [](QQmlEngine *engine, QJSEngine *jsEngine) -> QObject * {
         return FF7Item::qmlSingletonRegister(engine, jsEngine);
     });
 
-    QString versionString = QStringLiteral("%1").arg(ff7tkInfo::version());
+    qmlRegisterSingletonType<ff7tkInfo>("org.ff7tk", 1, 0, "FF7Info", [](QQmlEngine *engine, QJSEngine *jsEngine) -> QObject * {
+        return ff7tkInfo::qmlSingletonRegister(engine, jsEngine);
+    });
+
     QQmlApplicationEngine engine;
-    engine.rootContext()->setContextProperty("ff7tkVersion", versionString);
     engine.load(QUrl(QStringLiteral("qrc:/main.qml")));
 
     if (engine.rootObjects().isEmpty()) {

demos/ff7tkQmlGallery/main.qml

@@ -1,12 +1,12 @@
-import QtQuick 2.15
-import QtQuick.Controls 2.15
+import QtQuick
+import QtQuick.Controls
 import org.ff7tk 1.0 as FF7tk
 
 ApplicationWindow {
     id: root
     width: 800
     height: 600
-    title: "ff7tkQmlGallery-" + ff7tkVersion
+    title: "ff7tkQmlGallery-" + FF7tk.FF7Info.version
     visible: true
     header: Item {
         id: headerItem
@@ -70,6 +70,7 @@ ApplicationWindow {
                 anchors.top: itemPreviewOptions.bottom
                 anchors.left: parent.left
                 anchors.margins: 6
+                editable: true
                 value: -1
                 from: -1
                 to: 319

src/core/ff7tkInfo.h.in

@@ -20,9 +20,8 @@
 #include <QMap>
 #include <QTranslator>
 #include <QCoreApplication>
+#include <QQmlEngine>
 
-
-class QQmlEngine;
 class QJSEngine;
 
 /*! \class ff7tk
@@ -31,11 +30,17 @@ class QJSEngine;
 class FF7TK_EXPORT ff7tkInfo: public QObject
 {
     Q_OBJECT
+    Q_PROPERTY(QString ff7tkVersion READ version CONSTANT)
 public:
     /**
      * @brief Register The ff7tkInfo Singleton for QML
      */
-    static QObject *qmlSingletonRegister(QQmlEngine *engine, QJSEngine *scriptEngine);
+    static QObject *qmlSingletonRegister(QQmlEngine *engine, QJSEngine *scriptEngine)
+    {
+        Q_UNUSED(scriptEngine)
+        engine->setObjectOwnership(instance(), QQmlEngine::CppOwnership);
+        return instance();
+    }
 
     /**
      * @brief Report version of ff7tk in use
@@ -101,6 +106,10 @@ public:
         return ff7tk_translations;
     }
 private:
-    static ff7tkInfo *instance();
+    static ff7tkInfo *instance()
+    {
+        static ff7tkInfo m;
+        return &m;
+    }
     inline static const auto m_ff7tk_version = QStringLiteral("@FF7TK_VERSION@");
 };