Merge branch 'jb41605' into 'master'

Add plugins.qmltypes See merge request mer-core/libmce-qt!2
sailfishos · Aug 23, 2018 · 2febc46 · 2febc46
2 parents ef9b056 + fd1eb06
commit 2febc46
Show file tree

Hide file tree

Showing 6 changed files with 54 additions and 6 deletions.
diff --git a/lib/lib.pro b/lib/lib.pro
@@ -7,8 +7,6 @@ QT -= gui
 QMAKE_CXXFLAGS += -Wno-unused-parameter -Wno-psabi
 INCLUDEPATH += include
 
-include(version.pri)
-
 TEMPLATE = lib
 DEFINES += QMCE_LIBRARY
 
@@ -59,6 +57,5 @@ QMAKE_PKGCONFIG_DESTDIR = pkgconfig
 QMAKE_PKGCONFIG_INCDIR = $$headers.path
 QMAKE_PKGCONFIG_DESCRIPTION = Qt bindings for mce
 QMAKE_PKGCONFIG_PREFIX = $$PREFIX
-QMAKE_PKGCONFIG_VERSION = $$VERSION
 
 INSTALLS += target headers pkgconfig
diff --git a/lib/version.pri b/lib/version.pri
diff --git a/plugin/plugin.pro b/plugin/plugin.pro
@@ -14,6 +14,9 @@ OTHER_FILES += qmldir
 
 target.path = $$[QT_INSTALL_QML]/Nemo/Mce
 qmldir.path = $$[QT_INSTALL_QML]/Nemo/Mce
-qmldir.files += qmldir
+qmldir.files += qmldir plugins.qmltypes
 
 INSTALLS += target qmldir
+
+qmltypes.commands = qmlplugindump -nonrelocatable Nemo.Mce 1.0 > $$PWD/plugins.qmltypes
+QMAKE_EXTRA_TARGETS += qmltypes
diff --git a/plugin/plugins.qmltypes b/plugin/plugins.qmltypes
@@ -0,0 +1,48 @@
+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 Nemo.Mce 1.0'
+
+Module {
+    dependencies: []
+    Component {
+        name: "QMceDisplay"
+        prototype: "QObject"
+        exports: ["Nemo.Mce/MceDisplay 1.0"]
+        exportMetaObjectRevisions: [0]
+        Enum {
+            name: "State"
+            values: {
+                "DisplayOff": 0,
+                "DisplayDim": 1,
+                "DisplayOn": 2
+            }
+        }
+        Property { name: "valid"; type: "bool"; isReadonly: true }
+        Property { name: "state"; type: "State"; isReadonly: true }
+    }
+    Component {
+        name: "QMceTkLock"
+        prototype: "QObject"
+        exports: ["Nemo.Mce/MceTkLock 1.0"]
+        exportMetaObjectRevisions: [0]
+        Enum {
+            name: "Mode"
+            values: {
+                "Locked": 0,
+                "SilentLocked": 1,
+                "LockedDim": 2,
+                "LockedDelay": 3,
+                "SilentLockedDim": 4,
+                "Unlocked": 5,
+                "SilentUnlocked": 6
+            }
+        }
+        Property { name: "valid"; type: "bool"; isReadonly: true }
+        Property { name: "locked"; type: "bool"; isReadonly: true }
+        Property { name: "mode"; type: "Mode"; isReadonly: true }
+    }
+}
diff --git a/plugin/qmldir b/plugin/qmldir
@@ -1,2 +1,3 @@
 module Nemo.Mce
 plugin qmcedeclarative
+typeinfo plugins.qmltypes
diff --git a/rpm/libmce-qt5.spec b/rpm/libmce-qt5.spec
@@ -42,7 +42,7 @@ This package contains the development header files for libmce-qt5
 %setup -q -n %{name}-%{version}
 
 %build
-%qtc_qmake5
+%qtc_qmake5 "VERSION=$(sed 's/+.*//' <<<"%{version}")"
 %qtc_make %{?_smp_mflags}
 
 %install