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

Proposed by Olivier Tilloy
Status: Rejected
Rejected by: Alberto Mardegan
Proposed branch: lp:~osomon/unity-webapps-qml/qmltypes
Merge into: lp:unity-webapps-qml
Diff against target: 47 lines (+13/-4)
3 files modified
debian/control (+1/-0)
src/Ubuntu/UnityWebApps/plugin/plugin.pro (+8/-1)
src/Ubuntu/UnityWebApps/qmldir.in (+4/-3)
To merge this branch: bzr merge lp:~osomon/unity-webapps-qml/qmltypes
Reviewer Review Type Date Requested Status
Olivier Tilloy (community) Needs Fixing
PS Jenkins bot continuous-integration Pending
Review via email: mp+295242@code.launchpad.net

Commit message

Generate and ship typeinfo for the QML module.

To post a comment you must log in.
Revision history for this message
Alberto Mardegan (mardy) wrote :

LGTM, but let me quickly test it.

Revision history for this message
Alberto Mardegan (mardy) wrote :

The build is failing with these errors:

=====================
qmlplugindump -v -noinstantiate Ubuntu.UnityWebApps 0.1 . > ../UnityWebApps.qmltypes
parsing <outputOfQmlimportscanner> skipping Ubuntu.UnityWebApps
appending dependency QtQuick 2.0
appending dependency Ubuntu.Components 0.1
appending dependency QtQuick 2.4
appending dependency Ubuntu.Components 1.3
appending dependency Ubuntu.Components.ListItems 1.3
appending dependency Ubuntu.Components.Popups 1.3
appending dependency QtQuick.Layouts 1.1
skipping private dependecy Ubuntu.Components.Private 1.3
appending dependency Ubuntu.PerformanceMetrics 1.0
appending dependency QtQuick.Window 2.2
appending dependency QtQuick.Window 2.0
appending dependency Ubuntu.Components.ListItems 1.0
appending dependency Ubuntu.Components 1.2
appending dependency Ubuntu.Components.Popups 1.0
appending dependency Ubuntu.Components 1.0
appending dependency Ubuntu.Components 1.1
appending dependency QtFeedback 5.0
Found a dependency on Ubuntu.Components with two major versions:0.1 and 1.0 which is unsupported, discarding smaller version
Found a dependency on Ubuntu.Components with two major versions:0.1 and 1.1 which is unsupported, discarding smaller version
Found a dependency on Ubuntu.Components with two major versions:0.1 and 1.2 which is unsupported, discarding smaller version
Found a dependency on Ubuntu.Components with two major versions:0.1 and 1.3 which is unsupported, discarding smaller version
Mandatory default theme "Ubuntu.Components.Themes.Ambiance" missing!
Theme not found: "Ubuntu.Components.Themes.Ambiance"
QQmlComponent: Component is not ready
file:///media/mardy/Data/src/bzr/unity-webapps-qml/qmltypes/src/Ubuntu/UnityWebApps/plugin/loaddependencies.qml:9:1: module "Ubuntu.PerformanceMetrics" is not installed
Makefile:293: recipe for target '../libUnityWebApps.so' failed
=====================

161. By Olivier Tilloy

Add a build dependency on qtdeclarative5-dev-tools (for qmlplugindump).

162. By Olivier Tilloy

Fix the reference path of the module passed to qmlplugindump.

Revision history for this message
Olivier Tilloy (osomon) wrote :

I’m getting the following error when building in a clean chroot:

qmlplugindump -v -noinstantiate Ubuntu.UnityWebApps 0.1 ../../.. > ../UnityWebApps.qmltypes
parsing <outputOfQmlimportscanner> skipping Ubuntu.UnityWebApps
QQmlComponent: Component is not ready
file:///tmp/qmltypes/b/src/typelist.qml: Script file:///tmp/qmltypes/b/src/Ubuntu/UnityWebApps/UnityWebApps.js unavailable
file:///tmp/qmltypes/b/src/Ubuntu/UnityWebApps/UnityWebApps.js: File not found

This is because the QML and JS files don’t live in the same folder as the generated qmldir and .so files. They would need to be copied to the outdir as a prerequisite to calling qmlplugindump.

review: Needs Fixing
Revision history for this message
Alberto Mardegan (mardy) wrote :

Unmerged revisions

162. By Olivier Tilloy

Fix the reference path of the module passed to qmlplugindump.

161. By Olivier Tilloy

Add a build dependency on qtdeclarative5-dev-tools (for qmlplugindump).

160. By Olivier Tilloy

Generate and ship typeinfo for the QML module.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control'
2--- debian/control 2015-03-04 17:00:45 +0000
3+++ debian/control 2016-05-20 10:06:00 +0000
4@@ -18,6 +18,7 @@
5 qt5-qmake,
6 qtbase5-dev,
7 qtdeclarative5-dev,
8+ qtdeclarative5-dev-tools,
9 qtdeclarative5-test-plugin,
10 Standards-Version: 3.9.5
11 Homepage: https://launchpad.net/unity-webapp-qml
12
13=== modified file 'src/Ubuntu/UnityWebApps/plugin/plugin.pro'
14--- src/Ubuntu/UnityWebApps/plugin/plugin.pro 2015-02-23 15:46:02 +0000
15+++ src/Ubuntu/UnityWebApps/plugin/plugin.pro 2016-05-20 10:06:00 +0000
16@@ -66,9 +66,16 @@
17 DEFINES += \
18 API_URI=\\\"$${API_URI}\\\"
19
20+QMLTYPES_FILE = $${TARGET}.qmltypes
21+QMAKE_POST_LINK = qmlplugindump -v -noinstantiate $$API_URI $$PROJECT_VERSION ../../.. > ../$$QMLTYPES_FILE
22+
23 # plugin deployment
24 PLUGIN_INSTALL_PATH = $$[QT_INSTALL_QML]/$$replace(API_URI, \\., /)
25 target.path = $${PLUGIN_INSTALL_PATH}
26
27-INSTALLS += target
28+qmltypes_file.path = $$PLUGIN_INSTALL_PATH
29+qmltypes_file.files = ../$$QMLTYPES_FILE
30+qmltypes_file.CONFIG = no_check_exist
31+
32+INSTALLS += target qmltypes_file
33
34
35=== modified file 'src/Ubuntu/UnityWebApps/qmldir.in'
36--- src/Ubuntu/UnityWebApps/qmldir.in 2013-05-29 15:03:32 +0000
37+++ src/Ubuntu/UnityWebApps/qmldir.in 2016-05-20 10:06:00 +0000
38@@ -1,5 +1,6 @@
39 module $${API_URI}
40 plugin $${TARGET}
41-$${TARGET}Js 0.1 $${TARGET}.js
42-$${TARGET}Utils 0.1 $${TARGET}Utils.js
43-$${TARGET} 0.1 $${TARGET}.qml
44+typeinfo $${TARGET}.qmltypes
45+$${TARGET}Js $${PROJECT_VERSION} $${TARGET}.js
46+$${TARGET}Utils $${PROJECT_VERSION} $${TARGET}Utils.js
47+$${TARGET} $${PROJECT_VERSION} $${TARGET}.qml

Subscribers

People subscribed via source and target branches

to all changes: