telepathy-qt: dbus-tubes: This test does not require GIO in the end. Although, it does require Qt 4.8 due to its new DBus API.

Dario Freddi drf at kemper.freedesktop.org
Tue Jul 3 15:08:44 PDT 2012


Module: telepathy-qt
Branch: master
Commit: 934026b59f1b3043bd2d4c1158d371c0c3a214d5
URL:    http://cgit.freedesktop.org/telepathy/telepathy-qt/commit/?id=934026b59f1b3043bd2d4c1158d371c0c3a214d5

Author: Dario Freddi <dario.freddi at collabora.com>
Date:   Fri Nov  4 22:03:15 2011 +0100

dbus-tubes: This test does not require GIO in the end. Although, it does require Qt 4.8 due to its new DBus API.

---

 tests/dbus/CMakeLists.txt |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/tests/dbus/CMakeLists.txt b/tests/dbus/CMakeLists.txt
index 3ef6e63..96f7743 100644
--- a/tests/dbus/CMakeLists.txt
+++ b/tests/dbus/CMakeLists.txt
@@ -74,10 +74,15 @@ if(ENABLE_TP_GLIB_TESTS)
         tpqt_add_dbus_unit_test(StreamTubeHandlers stream-tube-handlers tp-glib-tests tp-qt-tests-glib-helpers)
         if(ENABLE_TP_GLIB_GIO_TESTS)
             tpqt_add_dbus_unit_test(StreamTubeChannel stream-tube-chan tp-glib-tests tp-qt-tests-glib-helpers)
-            tpqt_add_dbus_unit_test(DBusTubeChannel dbus-tube-chan tp-glib-tests tp-qt-tests-glib-helpers)
         endif(ENABLE_TP_GLIB_GIO_TESTS)
     endif (ENABLE_TESTS_WITH_RACES_IN_QT_4_6)
 
+    if(NOT (${QT_VERSION_MAJOR} EQUAL 4 AND ${QT_VERSION_MINOR} LESS 8))
+        message(STATUS "Enabling Qt 4.8+ tests")
+        tpqt_add_dbus_unit_test(DBusTubeChannel dbus-tube-chan tp-glib-tests tp-qt-tests-glib-helpers)
+    endif(NOT (${QT_VERSION_MAJOR} EQUAL 4 AND ${QT_VERSION_MINOR} LESS 8))
+
+
 endif(ENABLE_TP_GLIB_TESTS)
 
 tpqt_add_dbus_unit_test(CmProtocol cm-protocol)



More information about the telepathy-commits mailing list