diff options
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rw-r--r-- | debian/control | 6 | ||||
| -rw-r--r-- | libqmenumodel/QMenuModel/CMakeLists.txt | 6 |
3 files changed, 6 insertions, 10 deletions
diff --git a/debian/changelog b/debian/changelog index 37c0c3e..e050d43 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -qmenumodel (0.2.10) UNRELEASED; urgency=medium +qmenumodel (0.2.10+17.04.20161026.2-0ubuntu1) zesty; urgency=medium * Add ability to activate or change state of an action by variant string - -- Marco Trevisan (Treviño) <marco@ubuntu.com> Fri, 14 Oct 2016 17:07:41 +0200 + -- Marco Trevisan (Treviño) <mail@3v1n0.net> Wed, 26 Oct 2016 17:28:36 +0000 qmenumodel (0.2.9+16.04.20160329-0ubuntu1) xenial; urgency=medium diff --git a/debian/control b/debian/control index f8021ce..2008f64 100644 --- a/debian/control +++ b/debian/control @@ -9,9 +9,9 @@ Build-Depends: debhelper (>= 9.0.0), qt5-qmake, qtbase5-dev (>= 5.0), qtdeclarative5-dev (>= 5.0), - python3, - python3-dbus, - python3-gi, + python3:any, + python3-dbus:native, + python3-gi:native, gir1.2-glib-2.0, dbus-test-runner, libgles2-mesa-dev | libgl-dev, diff --git a/libqmenumodel/QMenuModel/CMakeLists.txt b/libqmenumodel/QMenuModel/CMakeLists.txt index 78e062b..eb4d463 100644 --- a/libqmenumodel/QMenuModel/CMakeLists.txt +++ b/libqmenumodel/QMenuModel/CMakeLists.txt @@ -24,11 +24,7 @@ qt5_use_modules(qmenumodel-qml Qml Quick) execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/qmldir" "${CMAKE_CURRENT_BINARY_DIR}/qmldir") -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(QMLPLUGIN_INSTALL_PREFIX "${QT_IMPORTS_DIR}/QMenuModel") install(TARGETS qmenumodel-qml DESTINATION ${QMLPLUGIN_INSTALL_PREFIX}) install(FILES qmldir DESTINATION ${QMLPLUGIN_INSTALL_PREFIX}) |