Ubuntu HTML5 UI SDK

Merge lp:~fboucault/ubuntu-html5-theme/crossbuild_fixes into lp:ubuntu-html5-theme

  1. crossbuild_fixes
  2. Merge into trunk
Proposed by Florian Boucault
Status: Merged
Approved by: Alexandre Abreu
Approved revision: 214
Merged at revision: 214
Proposed branch: lp:~fboucault/ubuntu-html5-theme/crossbuild_fixes
Merge into: lp:ubuntu-html5-theme
Diff against target: 34 lines (+3/-8)
2 files modified
debian/control (+1/-2)
src/plugin/Ubuntu/WebApps/CMakeLists.txt (+2/-6)
To merge this branch: bzr merge lp:~fboucault/ubuntu-html5-theme/crossbuild_fixes
Reviewer Review Type Date Requested Status
Alexandre Abreu Approve
PS Jenkins bot continuous-integration Pending
Review via email: mp+299199@code.launchpad.net

Commit message

Fixes for crossbuilding.

Description of the change

Fixes for crossbuilding.

To post a comment you must log in.
Revision history for this message
Alexandre Abreu (abreu-alexandre) wrote :

LGTM

review: Approve
Revision history for this message
Florian Boucault (fboucault) wrote :

can we get a top approve and a merge? :)

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-06-04 21:55:47 +0000
3+++ debian/control 2016-07-05 17:27:31 +0000
4@@ -5,10 +5,9 @@
5 Build-Depends: cmake (>= 2.8.9),
6 debhelper (>= 9),
7 liboxideqt-qmlplugin (>= 1.2.0),
8- python3-all,
9+ python3-all:any,
10 python3-setuptools,
11 qt5-default,
12- qt5-qmake,
13 qtbase5-dev (>= 5.4),
14 qtdeclarative5-dev,
15 qtdeclarative5-qtquick2-plugin,
16
17=== modified file 'src/plugin/Ubuntu/WebApps/CMakeLists.txt'
18--- src/plugin/Ubuntu/WebApps/CMakeLists.txt 2013-12-10 16:16:11 +0000
19+++ src/plugin/Ubuntu/WebApps/CMakeLists.txt 2016-07-05 17:27:31 +0000
20@@ -1,12 +1,8 @@
21 project(ubuntu-html5-container)
22
23 # setup install location
24-execute_process(
25- COMMAND qmake -query QT_INSTALL_QML
26- OUTPUT_VARIABLE QT_INSTALL_QML
27- OUTPUT_STRIP_TRAILING_WHITESPACE
28-)
29-set(HTML5_CONTAINER_IMPORTS_DIR "${QT_INSTALL_QML}/Ubuntu/WebApps")
30+set(QT_IMPORTS_DIR "${CMAKE_INSTALL_LIBDIR}/qt5/qml")
31+set(HTML5_CONTAINER_IMPORTS_DIR "${QT_IMPORTS_DIR}/Ubuntu/WebApps")
32
33 # setup install for local component files
34 file(GLOB QML_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.qml qmldir)

Subscribers

People subscribed via source and target branches