Merge branch 'jb41605' into 'master'

Add plugins.qmltypes See merge request mer-core/libqofono!11
sailfishos · Jun 22, 2018 · 441598f · 441598f
2 parents 6916cd0 + 5ef7320
commit 441598f
Show file tree

Hide file tree

Showing 7 changed files with 1,899 additions and 94 deletions.
diff --git a/plugin/plugin.pro b/plugin/plugin.pro
@@ -30,8 +30,7 @@ HEADERS = \
 INCLUDEPATH += ../src
 
 OTHER_FILES += \
-    plugin.json qmldir
-#plugins.qmltypes
+    plugin.json plugins.qmltypes qmldir
 
 equals(QT_MAJOR_VERSION, 4): {
     qmldir.path = $$[QT_INSTALL_IMPORTS]/MeeGo/QOfono
@@ -43,7 +42,9 @@ equals(QT_MAJOR_VERSION, 5): {
     target.path = $$[QT_INSTALL_QML]/MeeGo/QOfono
 }
 
-qmldir.files += qmldir
-
+qmldir.files += qmldir plugins.qmltypes
 
 INSTALLS += target qmldir
+
+qmltypes.commands = qmlplugindump -nonrelocatable MeeGo.QOfono 0.2 > $$PWD/plugins.qmltypes
+QMAKE_EXTRA_TARGETS += qmltypes