diff options
author | Olivier Tilloy <olivier.tilloy@canonical.com> | 2012-10-05 11:59:50 +0200 |
---|---|---|
committer | Olivier Tilloy <olivier.tilloy@canonical.com> | 2012-10-05 11:59:50 +0200 |
commit | 81dbf09d988d87f82496ba106b5f1dd2aad7967d (patch) | |
tree | d1fed43374afcd9be379998526b7de11d591e271 /tests/client/CMakeLists.txt | |
parent | 696fba50395807c344325af11e71ec74cf370c3d (diff) | |
download | qmenumodel-81dbf09d988d87f82496ba106b5f1dd2aad7967d.tar.gz qmenumodel-81dbf09d988d87f82496ba106b5f1dd2aad7967d.tar.bz2 qmenumodel-81dbf09d988d87f82496ba106b5f1dd2aad7967d.zip |
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.
Diffstat (limited to 'tests/client/CMakeLists.txt')
-rw-r--r-- | tests/client/CMakeLists.txt | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/tests/client/CMakeLists.txt b/tests/client/CMakeLists.txt index 2c48a07..e9de735 100644 --- a/tests/client/CMakeLists.txt +++ b/tests/client/CMakeLists.txt @@ -1,8 +1,9 @@ macro(declare_test testname)
set(TEST_MOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/${testname}.moc)
- qt4_generate_moc(${testname}.cpp ${TEST_MOC_FILE})
+ qt5_generate_moc(${testname}.cpp ${TEST_MOC_FILE})
add_executable(${testname} ${testname}.cpp ${TEST_MOC_FILE})
+ qt5_use_modules(${testname} Core DBus Widgets Test)
target_link_libraries(${testname}
qmenumodel
dbusmenuscript
@@ -26,9 +27,10 @@ endmacro(declare_test testname) macro(declare_simple_test testname)
set(TEST_MOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/${testname}.moc)
- qt4_generate_moc(${testname}.cpp ${TEST_MOC_FILE})
+ qt5_generate_moc(${testname}.cpp ${TEST_MOC_FILE})
add_executable(${testname} ${testname}.cpp ${TEST_MOC_FILE})
+ qt5_use_modules(${testname} Core Test)
target_link_libraries(${testname}
qmenumodel
${QT_QTTEST_LIBRARY}
@@ -67,3 +69,4 @@ declare_test(menuchangestest) declare_test(modeltest)
declare_test(actiongrouptest)
declare_simple_test(convertertest)
+
|