From 81dbf09d988d87f82496ba106b5f1dd2aad7967d Mon Sep 17 00:00:00 2001 From: Olivier Tilloy 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. --- tests/client/CMakeLists.txt | 7 +++++-- tests/client/actiongrouptest.cpp | 5 +++++ tests/client/menuchangestest.cpp | 5 +++++ tests/client/modeltest.cpp | 5 +++++ tests/client/servicetest.cpp | 5 +++++ 5 files changed, 25 insertions(+), 2 deletions(-) (limited to 'tests/client') 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) + diff --git a/tests/client/actiongrouptest.cpp b/tests/client/actiongrouptest.cpp index 116bd44..958ddc7 100644 --- a/tests/client/actiongrouptest.cpp +++ b/tests/client/actiongrouptest.cpp @@ -17,6 +17,10 @@ * Renato Araujo Oliveira Filho */ +extern "C" { +#include +} + #include "qdbusmenumodel.h" #include "qdbusactiongroup.h" #include "dbusmenuscript.h" @@ -38,6 +42,7 @@ private: private Q_SLOTS: void initTestCase() { + g_type_init(); Q_ASSERT(m_script.connect()); } diff --git a/tests/client/menuchangestest.cpp b/tests/client/menuchangestest.cpp index 2015582..bc7dcbd 100644 --- a/tests/client/menuchangestest.cpp +++ b/tests/client/menuchangestest.cpp @@ -17,6 +17,10 @@ * Renato Araujo Oliveira Filho */ +extern "C" { +#include +} + #include "qdbusmenumodel.h" #include "dbusmenuscript.h" @@ -35,6 +39,7 @@ private: private Q_SLOTS: void initTestCase() { + g_type_init(); Q_ASSERT(m_script.connect()); } diff --git a/tests/client/modeltest.cpp b/tests/client/modeltest.cpp index 9f6ee76..542b38a 100644 --- a/tests/client/modeltest.cpp +++ b/tests/client/modeltest.cpp @@ -17,6 +17,10 @@ * Renato Araujo Oliveira Filho */ +extern "C" { +#include +} + #include "qdbusmenumodel.h" #include "dbusmenuscript.h" @@ -35,6 +39,7 @@ private: private Q_SLOTS: void initTestCase() { + g_type_init(); Q_ASSERT(m_script.connect()); } diff --git a/tests/client/servicetest.cpp b/tests/client/servicetest.cpp index a8b0c2a..d34ba79 100644 --- a/tests/client/servicetest.cpp +++ b/tests/client/servicetest.cpp @@ -17,6 +17,10 @@ * Renato Araujo Oliveira Filho */ +extern "C" { +#include +} + #include "qdbusmenumodel.h" #include "dbusmenuscript.h" @@ -42,6 +46,7 @@ private: private Q_SLOTS: void initTestCase() { + g_type_init(); Q_ASSERT(m_script.connect()); } -- cgit v1.2.3 From 82677d03e4ec89ea4387467bcf7caa954a5ae183 Mon Sep 17 00:00:00 2001 From: Olivier Tilloy Date: Fri, 5 Oct 2012 15:13:34 +0200 Subject: Use the automoc feature to simplify a lot the build system. --- tests/client/CMakeLists.txt | 32 +++++++------------------------- 1 file changed, 7 insertions(+), 25 deletions(-) (limited to 'tests/client') diff --git a/tests/client/CMakeLists.txt b/tests/client/CMakeLists.txt index e9de735..7455b16 100644 --- a/tests/client/CMakeLists.txt +++ b/tests/client/CMakeLists.txt @@ -1,18 +1,12 @@ macro(declare_test testname) - set(TEST_MOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/${testname}.moc) - qt5_generate_moc(${testname}.cpp ${TEST_MOC_FILE}) - - add_executable(${testname} ${testname}.cpp ${TEST_MOC_FILE}) + add_executable(${testname} ${testname}.cpp) qt5_use_modules(${testname} Core DBus Widgets Test) target_link_libraries(${testname} qmenumodel dbusmenuscript - ${QT_QTTEST_LIBRARY} - ${QT_QTCORE_LIBRARY} - ${QT_QTGUI_LIBRARY} - ${QT_QTDBUS_LIBRARY} ${GLIB_LDFLAGS} - ${GIO_LDFLAGS}) + ${GIO_LDFLAGS} + ) add_test(${testname} ${DBUS_RUNNER} @@ -26,19 +20,13 @@ macro(declare_test testname) endmacro(declare_test testname) macro(declare_simple_test testname) - set(TEST_MOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/${testname}.moc) - qt5_generate_moc(${testname}.cpp ${TEST_MOC_FILE}) - - add_executable(${testname} ${testname}.cpp ${TEST_MOC_FILE}) + add_executable(${testname} ${testname}.cpp) qt5_use_modules(${testname} Core Test) target_link_libraries(${testname} qmenumodel - ${QT_QTTEST_LIBRARY} - ${QT_QTCORE_LIBRARY} - ${QT_QTGUI_LIBRARY} - ${QT_QTDBUS_LIBRARY} ${GLIB_LDFLAGS} - ${GIO_LDFLAGS}) + ${GIO_LDFLAGS} + ) add_test(${testname} ${CMAKE_CURRENT_BINARY_DIR}/${testname}) @@ -49,14 +37,8 @@ endmacro(declare_simple_test testname) include_directories(${src_SOURCE_DIR} ${dbusmenuscript_SOURCE_DIR} - ${CMAKE_CURRENT_BINARY_DIR} - ${QT_INCLUDE_DIR} - ${QT_QTTEST_INCLUDE_DIR} - ${QT_QTCORE_INCLUDE_DIR} - ${QT_QTGUI_INCLUDE_DIR} - ${QT_QTDBUS_INCLUDE_DIR} ${GLIB_INCLUDE_DIRS} - ${GIO_INCLUDE_DIRS}) +) add_definitions(-DTEST_SUITE) set(TEST_PYTHONPATH ${dbusmenuscript_SOURCE_DIR}) -- cgit v1.2.3