Merge lp:~mardy/unity-webapps-qml/qmltypes into lp:unity-webapps-qml

[Alberto Mardegan]

Generate and ship typeinfo for the QML module.

[Alexandre Abreu (abreu-alexandre)]

LGTM

Unmerged revisions

161. By Alberto Mardegan on 2016-05-20

Fix qmlplugindump invocation and add deps

160. By Olivier Tilloy on 2016-05-19

Generate and ship typeinfo for the QML module.

=== modified file 'debian/control'
--- debian/control	2015-03-04 17:00:45 +0000
+++ debian/control	2016-05-20 12:28:43 +0000
@@ -14,10 +14,12 @@
                pkg-config,
                python (>= 2.7),
                python-setuptools,
+               qml-module-ubuntu-components,
                qt5-default,
                qt5-qmake,
                qtbase5-dev,
                qtdeclarative5-dev,
+               qtdeclarative5-dev-tools,
                qtdeclarative5-test-plugin,
 Standards-Version: 3.9.5
 Homepage: https://launchpad.net/unity-webapp-qml

=== modified file 'src/Ubuntu/UnityWebApps/plugin/plugin.pro'
--- src/Ubuntu/UnityWebApps/plugin/plugin.pro	2015-02-23 15:46:02 +0000
+++ src/Ubuntu/UnityWebApps/plugin/plugin.pro	2016-05-20 12:28:43 +0000
@@ -66,9 +66,16 @@
 DEFINES += \
     API_URI=\\\"$${API_URI}\\\"
 
+QMLTYPES_FILE = $${TARGET}.qmltypes
+QMAKE_POST_LINK = qmlplugindump -v -noinstantiate $$API_URI $$PROJECT_VERSION ../../.. > ../$$QMLTYPES_FILE
+
 # plugin deployment
 PLUGIN_INSTALL_PATH = $$[QT_INSTALL_QML]/$$replace(API_URI, \\., /)
 target.path = $${PLUGIN_INSTALL_PATH}
 
-INSTALLS += target
+qmltypes_file.path = $$PLUGIN_INSTALL_PATH
+qmltypes_file.files = ../$$QMLTYPES_FILE
+qmltypes_file.CONFIG = no_check_exist
+
+INSTALLS += target qmltypes_file
 

=== modified file 'src/Ubuntu/UnityWebApps/qmldir.in'
--- src/Ubuntu/UnityWebApps/qmldir.in	2013-05-29 15:03:32 +0000
+++ src/Ubuntu/UnityWebApps/qmldir.in	2016-05-20 12:28:43 +0000
@@ -1,5 +1,6 @@
 module $${API_URI}
 plugin $${TARGET}
-$${TARGET}Js 0.1 $${TARGET}.js
-$${TARGET}Utils 0.1 $${TARGET}Utils.js
-$${TARGET} 0.1 $${TARGET}.qml
+typeinfo $${TARGET}.qmltypes
+$${TARGET}Js $${PROJECT_VERSION} $${TARGET}.js
+$${TARGET}Utils $${PROJECT_VERSION} $${TARGET}Utils.js
+$${TARGET} $${PROJECT_VERSION} $${TARGET}.qml