Merge branch 'jb34866' into 'mer-stable'

[qtwebkit] Package plugins.qmltypes. Contributes to JB#34866 Attention: not tried to build (yet) See merge request !7
sailfishos · May 7, 2016 · 5d75db6 · 5d75db6
2 parents 60c54af + 3d0ffff
commit 5d75db6
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/qtwebkit/Source/WebKit/qt/declarative/public.pri b/qtwebkit/Source/WebKit/qt/declarative/public.pri
@@ -48,7 +48,7 @@ isEmpty(importPath): importPath = $$[QT_INSTALL_IMPORTS]
 target.path = $${importPath}/$${TARGET.module_name}
 
 
-qmldir.files += $$PWD/qmldir
+qmldir.files += $$PWD/qmldir $$PWD/plugins.qmltypes
 qmldir.path +=  $${importPath}/$${TARGET.module_name}
 
 INSTALLS += target qmldir
diff --git a/qtwebkit/Source/WebKit/qt/declarative/qmldir b/qtwebkit/Source/WebKit/qt/declarative/qmldir
@@ -1,3 +1,5 @@
 module QtWebKit
 plugin qmlwebkitplugin
+classname WebKitQmlPlugin
 typeinfo plugins.qmltypes
+
diff --git a/rpm/qtwebkit5.spec b/rpm/qtwebkit5.spec
@@ -255,6 +255,7 @@ find %{buildroot}%{_libdir} -type f -name '*.prl' \
 %files -n qt5-qtqml-import-webkitplugin
 %defattr(-,root,root,-)
 %{_libdir}/qt5/qml/QtWebKit/libqmlwebkitplugin.so
+%{_libdir}/qt5/qml/QtWebKit/plugins.qmltypes
 %{_libdir}/qt5/qml/QtWebKit/qmldir
 
 %files -n qt5-qtqml-import-webkitplugin-experimental