Ubuntu Notes app

Merge lp:~fboucault/reminders-app/crossbuild_fixes into lp:reminders-app

  1. crossbuild_fixes
  2. Merge into trunk
Proposed by Florian Boucault
Status: Merged
Approved by: Michael Zanetti
Approved revision: 581
Merged at revision: 581
Proposed branch: lp:~fboucault/reminders-app/crossbuild_fixes
Merge into: lp:reminders-app
Diff against target: 29 lines (+2/-6)
2 files modified
CMakeLists.txt (+1/-5)
debian/control (+1/-1)
To merge this branch: bzr merge lp:~fboucault/reminders-app/crossbuild_fixes
Reviewer Review Type Date Requested Status
Jenkins Bot continuous-integration Approve
Michael Zanetti (community) Approve
Review via email: mp+299206@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
Michael Zanetti (mzanetti) wrote :

lgtm

review: Approve
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2015-11-02 20:26:37 +0000
3+++ CMakeLists.txt 2016-07-05 17:59:26 +0000
4@@ -82,11 +82,7 @@
5 install(FILES COPYING DESTINATION ${CMAKE_INSTALL_PREFIX})
6 else(CLICK_MODE)
7 # components PATH
8- execute_process(
9- COMMAND qmake -query QT_INSTALL_QML
10- OUTPUT_VARIABLE QT_IMPORTS_DIR
11- OUTPUT_STRIP_TRAILING_WHITESPACE
12- )
13+ set(QT_IMPORTS_DIR "${CMAKE_INSTALL_LIBDIR}/qt5/qml")
14 set(DATA_DIR ${CMAKE_INSTALL_DATADIR}/${APP_HARDCODE})
15 set(ICON "${CMAKE_INSTALL_PREFIX}/${DATA_DIR}/${ICON}")
16 set(DESKTOP_DIR ${CMAKE_INSTALL_DATADIR}/applications)
17
18=== modified file 'debian/control'
19--- debian/control 2016-05-18 12:56:16 +0000
20+++ debian/control 2016-07-05 17:59:26 +0000
21@@ -10,7 +10,7 @@
22 liboxideqt-qmlplugin,
23 libssl-dev,
24 pkg-config,
25- python3-all,
26+ python3-all:any,
27 qml-module-qttest,
28 qml-module-qt-labs-settings,
29 qml-module-ubuntu-connectivity,

Subscribers

People subscribed via source and target branches