aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/control5
-rw-r--r--debian/qmenumodel-qml.install2
-rw-r--r--libqmenumodel/QMenuModel/CMakeLists.txt2
-rw-r--r--libqmenumodel/src/qmenumodel.pc.in2
4 files changed, 5 insertions, 6 deletions
diff --git a/debian/control b/debian/control
index 4a85338..b086113 100644
--- a/debian/control
+++ b/debian/control
@@ -5,8 +5,8 @@ Maintainer: Renato Araujo Oliveira Filho <renato@canonical.com>
Build-Depends: debhelper (>= 9.0.0),
cmake (>= 2.8.9),
libglib2.0-dev,
- qtbase (>= 5.0),
- qtdeclarative (>= 5.0),
+ qtbase5-dev (>= 5.0),
+ qtdeclarative5-dev (>= 5.0),
python3,
python3-dbus,
python3-gi,
@@ -32,7 +32,6 @@ Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends},
libqmenumodel0 (= ${binary:Version}),
- qtbase (>= 5.0),
Description: Qt binding for GMenuModel - development files
Qt binding for GMenuModel that allows connecting to a menu model exposed on
D-Bus and presents it as a list model.
diff --git a/debian/qmenumodel-qml.install b/debian/qmenumodel-qml.install
index 58ec19a..b0cf4c8 100644
--- a/debian/qmenumodel-qml.install
+++ b/debian/qmenumodel-qml.install
@@ -1,2 +1,2 @@
-opt/qt5/imports/QMenuModel/*
+/usr/lib/*/qt5/qml/QMenuModel/*
diff --git a/libqmenumodel/QMenuModel/CMakeLists.txt b/libqmenumodel/QMenuModel/CMakeLists.txt
index 8a7702f..047938f 100644
--- a/libqmenumodel/QMenuModel/CMakeLists.txt
+++ b/libqmenumodel/QMenuModel/CMakeLists.txt
@@ -26,7 +26,7 @@ execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_S
# Apparently, QT_IMPORTS_DIR didn’t make it to Qt5.
# In want of a better solution, let’s hardcode it…
-set(QT_IMPORTS_DIR /opt/qt5/imports)
+set(QT_IMPORTS_DIR ${_qt5Qml_install_prefix}/${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})
diff --git a/libqmenumodel/src/qmenumodel.pc.in b/libqmenumodel/src/qmenumodel.pc.in
index 1c410bc..56f149a 100644
--- a/libqmenumodel/src/qmenumodel.pc.in
+++ b/libqmenumodel/src/qmenumodel.pc.in
@@ -7,7 +7,7 @@ Name: qmenumodel
Description: Qt binding for GMenuModel.
Version: 0.1
-Requires.private: QtCore QtWidgets gio-2.0
+Requires.private: Qt5Core Qt5Widgets gio-2.0
Libs: -L${libdir} -l@SHAREDLIBNAME@
Cflags: -I${includedir}/@INCLUDEDIR@