From 81dbf09d988d87f82496ba106b5f1dd2aad7967d Mon Sep 17 00:00:00 2001
From: Olivier Tilloy <olivier.tilloy@canonical.com>
Date: Fri, 5 Oct 2012 11:59:50 +0200
Subject: Port to Qt5.

To compile and test, one needs to install the qt5-meta-minimal package from the Canonical Qt5 Edgers PPA (https://launchpad.net/~canonical-qt5-edgers/+archive/qt5-beta1). This installs Qt5 in /opt/qt5/. cmake needs to be invoked with CMAKE_PREFIX_PATH=/opt/qt5/lib/cmake, and /opt/qt5/bin needs to be added to $PATH.
---
 libqmenumodel/src/CMakeLists.txt | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'libqmenumodel/src/CMakeLists.txt')

diff --git a/libqmenumodel/src/CMakeLists.txt b/libqmenumodel/src/CMakeLists.txt
index 17d11f1..7e31941 100644
--- a/libqmenumodel/src/CMakeLists.txt
+++ b/libqmenumodel/src/CMakeLists.txt
@@ -19,7 +19,7 @@ set(QMENUMODEL_HEADERS
     qstateaction.h
 )
 
-qt4_wrap_cpp(QMENUMODEL_MOC
+qt5_wrap_cpp(QMENUMODEL_MOC
     ${QMENUMODEL_HEADERS}
 )
 
@@ -39,8 +39,11 @@ include_directories(
     ${GIO_INCLUDE_DIRS}
 )
 
+qt5_use_modules(qmenumodel Core Widgets)
+
 target_link_libraries(qmenumodel
     ${QT_QTCORE_LIBRARY}
     ${GLIB_LDFLAGS}
     ${GIO_LDFLAGS}
 )
+
-- 
cgit v1.2.3


From 82677d03e4ec89ea4387467bcf7caa954a5ae183 Mon Sep 17 00:00:00 2001
From: Olivier Tilloy <olivier.tilloy@canonical.com>
Date: Fri, 5 Oct 2012 15:13:34 +0200
Subject: Use the automoc feature to simplify a lot the build system.

---
 libqmenumodel/src/CMakeLists.txt | 27 +--------------------------
 1 file changed, 1 insertion(+), 26 deletions(-)

(limited to 'libqmenumodel/src/CMakeLists.txt')

diff --git a/libqmenumodel/src/CMakeLists.txt b/libqmenumodel/src/CMakeLists.txt
index 7e31941..373d11b 100644
--- a/libqmenumodel/src/CMakeLists.txt
+++ b/libqmenumodel/src/CMakeLists.txt
@@ -2,6 +2,7 @@ project(src)
 
 set(QMENUMODEL_SRC
     converter.cpp
+    dbus-enums.h
     qmenumodel.cpp
     qdbusobject.cpp
     qdbusmenumodel.cpp
@@ -9,41 +10,15 @@ set(QMENUMODEL_SRC
     qstateaction.cpp
 )
 
-set(QMENUMODEL_HEADERS
-    converter.h
-    dbus-enums.h
-    qmenumodel.h
-    qdbusobject.h
-    qdbusmenumodel.h
-    qdbusactiongroup.h
-    qstateaction.h
-)
-
-qt5_wrap_cpp(QMENUMODEL_MOC
-    ${QMENUMODEL_HEADERS}
-)
-
 add_library(qmenumodel STATIC
     ${QMENUMODEL_SRC}
-    ${QMENUMODEL_MOC}
 )
 
 set_target_properties(qmenumodel PROPERTIES COMPILE_FLAGS -fPIC)
 
 include_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${QT_INCLUDE_DIR}
-    ${QT_QTCORE_INCLUDE_DIR}
-    ${QT_QTGUI_INCLUDE_DIR}
     ${GLIB_INCLUDE_DIRS}
-    ${GIO_INCLUDE_DIRS}
 )
 
 qt5_use_modules(qmenumodel Core Widgets)
 
-target_link_libraries(qmenumodel
-    ${QT_QTCORE_LIBRARY}
-    ${GLIB_LDFLAGS}
-    ${GIO_LDFLAGS}
-)
-
-- 
cgit v1.2.3