Florian Boucault has proposed merging
lp:~fboucault/reminders-app/crossbuild_fixes into lp:reminders-app.
Commit message:
Fixes for crossbuilding.
Requested reviews:
Ubuntu Notes app developers (notes-app-dev)
For more details, see:
https://code.launchpad.net/~fboucault/reminders-app/crossbuild_fixes/+merge/299206
Fixes for crossbuilding.
--
Your team Ubuntu Notes app developers is requested to review the proposed merge
of lp:~fboucault/reminders-app/crossbuild_fixes into lp:reminders-app.
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt 2015-11-02 20:26:37 +0000
+++ CMakeLists.txt 2016-07-05 17:59:26 +0000
@@ -82,11 +82,7 @@
install(FILES COPYING DESTINATION ${CMAKE_INSTALL_PREFIX})
else(CLICK_MODE)
# components PATH
- execute_process(
- COMMAND qmake -query QT_INSTALL_QML
- OUTPUT_VARIABLE QT_IMPORTS_DIR
- OUTPUT_STRIP_TRAILING_WHITESPACE
- )
+ set(QT_IMPORTS_DIR "${CMAKE_INSTALL_LIBDIR}/qt5/qml")
set(DATA_DIR ${CMAKE_INSTALL_DATADIR}/${APP_HARDCODE})
set(ICON "${CMAKE_INSTALL_PREFIX}/${DATA_DIR}/${ICON}")
set(DESKTOP_DIR ${CMAKE_INSTALL_DATADIR}/applications)
=== modified file 'debian/control'
--- debian/control 2016-05-18 12:56:16 +0000
+++ debian/control 2016-07-05 17:59:26 +0000
@@ -10,7 +10,7 @@
liboxideqt-qmlplugin,
libssl-dev,
pkg-config,
- python3-all,
+ python3-all:any,
qml-module-qttest,
qml-module-qt-labs-settings,
qml-module-ubuntu-connectivity,
--
Mailing list: https://launchpad.net/~ubuntu-touch-coreapps-reviewers
Post to : ubuntu-touch-coreapps-reviewers@lists.launchpad.net
Unsubscribe : https://launchpad.net/~ubuntu-touch-coreapps-reviewers
More help : https://help.launchpad.net/ListHelp
