aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog1
-rw-r--r--debian/control5
-rwxr-xr-xdebian/rules2
-rw-r--r--libqmenumodel/QMenuModel/CMakeLists.txt3
4 files changed, 9 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index c855594..5cc0dbf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
qmenumodel (0.1.1) UNRELEASED; urgency=low
* Renaming source package to qmenumodel
+ * Port to Qt5
-- Olivier Tilloy <olivier.tilloy@canonical.com> Thu, 04 Oct 2012 17:37:23 +0200
diff --git a/debian/control b/debian/control
index e07ea3a..211a3c1 100644
--- a/debian/control
+++ b/debian/control
@@ -4,9 +4,10 @@ Priority: optional
Maintainer: Renato Araujo Oliveira Filho <renato@canonical.com>
Build-Depends: debhelper (>= 8.0.0),
cdbs,
- cmake,
+ cmake (>= 2.8.9),
libglib2.0-dev,
- libqt4-dev,
+ qtbase (>= 5.0),
+ qtdeclarative (>= 5.0),
Standards-Version: 3.9.2
Package: qmenumodel-qml
diff --git a/debian/rules b/debian/rules
index 07ae845..2756628 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,8 @@
#!/usr/bin/make -f
# -*- makefile -*-
+DEB_CMAKE_EXTRA_FLAGS = -DCMAKE_PREFIX_PATH=/opt/qt5/lib/cmake
+
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/rules/utils.mk
include /usr/share/cdbs/1/class/cmake.mk
diff --git a/libqmenumodel/QMenuModel/CMakeLists.txt b/libqmenumodel/QMenuModel/CMakeLists.txt
index 1a52ea0..fbc448e 100644
--- a/libqmenumodel/QMenuModel/CMakeLists.txt
+++ b/libqmenumodel/QMenuModel/CMakeLists.txt
@@ -41,6 +41,9 @@ target_link_libraries(qmenumodel-qml
execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/qmldir"
"${CMAKE_CURRENT_BINARY_DIR}/qmldir")
+# 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(QMLPLUGIN_INSTALL_PREFIX "${QT_IMPORTS_DIR}/QMenuModel")
install(TARGETS qmenumodel-qml DESTINATION ${QMLPLUGIN_INSTALL_PREFIX})
install(FILES qmldir DESTINATION ${QMLPLUGIN_INSTALL_PREFIX})