Merge branch 'jb41605' into 'master'

Add plugins.qmltypes See merge request mer-core/nemo-qml-plugin-devicelock!35
sailfishos · Jun 28, 2018 · 9107d36 · 9107d36
2 parents 087cc6b + 35ae9dd
commit 9107d36
Show file tree

Hide file tree

Showing 4 changed files with 740 additions and 1 deletion.
diff --git a/rpm/nemo-qml-plugin-devicelock.spec b/rpm/nemo-qml-plugin-devicelock.spec
@@ -4,7 +4,7 @@ Version:    0.2.1
 Release:    1
 Group:      System/Libraries
 License:    LGPLv2.1
-URL:        https://git.merproject.org/mer-core/nemo-qml-plugin-dbus
+URL:        https://git.merproject.org/mer-core/nemo-qml-plugin-devicelock
 Source0:    %{name}-%{version}.tar.bz2
 BuildRequires:  pkgconfig(Qt5DBus)
 BuildRequires:  pkgconfig(Qt5Core)
@@ -74,6 +74,7 @@ ln -sf ../nemo-devicelock.socket %{buildroot}/lib/systemd/system/multi-user.targ
 %{_libdir}/libnemodevicelock.so.*
 %dir %{_libdir}/qt5/qml/org/nemomobile/devicelock
 %{_libdir}/qt5/qml/org/nemomobile/devicelock/libnemodevicelockplugin.so
+%{_libdir}/qt5/qml/org/nemomobile/devicelock/plugins.qmltypes
 %{_libdir}/qt5/qml/org/nemomobile/devicelock/qmldir
 /lib/systemd/system/nemo-devicelock.socket
 /lib/systemd/system/multi-user.target.wants/nemo-devicelock.socket

diff --git a/src/plugin/plugin.pro b/src/plugin/plugin.pro
@@ -23,6 +23,7 @@ SOURCES = \
         plugin.cpp
 
 import.files = \
+        plugins.qmltypes \
         qmldir
 import.path = $$TARGETPATH
 
@@ -31,3 +32,6 @@ target.path = $$TARGETPATH
 INSTALLS += \
         import \
         target
+
+qmltypes.commands = qmlplugindump -nonrelocatable org.nemomobile.devicelock 1.0 > $$PWD/plugins.qmltypes
+QMAKE_EXTRA_TARGETS += qmltypes