Merge branch 'jb41605' into 'master'

Add plugins.qmltypes See merge request mer-core/nemo-qml-plugin-filemanager!12
sailfishos · Jun 28, 2018 · 51d7e55 · 51d7e55
2 parents 3209169 + b94f7b4
commit 51d7e55
Show file tree

Hide file tree

Showing 4 changed files with 562 additions and 1 deletion.
diff --git a/rpm/nemo-qml-plugin-filemanager.spec b/rpm/nemo-qml-plugin-filemanager.spec
@@ -45,6 +45,7 @@ chmod o-r -R %{buildroot}/opt/tests/nemo-qml-plugins/filemanager/auto/hiddenfold
 %files
 %defattr(-,root,root,-)
 %{_libdir}/qt5/qml/Nemo/FileManager/libnemofilemanager.so
+%{_libdir}/qt5/qml/Nemo/FileManager/plugins.qmltypes
 %{_libdir}/qt5/qml/Nemo/FileManager/qmldir
 %{_bindir}/fileoperationsd
 %{_datadir}/dbus-1/services/org.nemomobile.FileOperations.service

diff --git a/src/plugin/plugin.pro b/src/plugin/plugin.pro
@@ -23,10 +23,13 @@ QMAKE_LFLAGS *= -Wl,--as-needed
 target.path = $$[QT_INSTALL_QML]/$$PLUGIN_IMPORT_PATH
 INSTALLS += target
 
-qmldir.files += $$_PRO_FILE_PWD_/qmldir
+qmldir.files += qmldir plugins.qmltypes
 qmldir.path +=  $$target.path
 INSTALLS += qmldir
 
+qmltypes.commands = qmlplugindump -nonrelocatable Nemo.FileManager 1.0 > $$PWD/plugins.qmltypes
+QMAKE_EXTRA_TARGETS += qmltypes
+
 system(qdbusxml2cpp -c FileOperationsProxy -p fileoperationsproxy.h:fileoperationsproxy.cpp ../../dbus/org.nemomobile.FileOperations.xml)
 
 SOURCES += archiveinfo.cpp \