From 9a061a0a2c6dcf2248653396f3c5ec867a2f8aa7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Wed, 17 Jul 2013 21:55:18 +0200 Subject: Remove unused member in QEventLoop auto-test Change-Id: Icd6a09402c3cf14286f4ba1f8f4c99ac483ec1a3 Reviewed-by: Gabriel de Dietrich Reviewed-by: Frederik Gladhorn --- tests/auto/corelib/kernel/qeventloop/tst_qeventloop.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'tests/auto/corelib/kernel/qeventloop') diff --git a/tests/auto/corelib/kernel/qeventloop/tst_qeventloop.cpp b/tests/auto/corelib/kernel/qeventloop/tst_qeventloop.cpp index 25e5f03566..c696c6e21a 100644 --- a/tests/auto/corelib/kernel/qeventloop/tst_qeventloop.cpp +++ b/tests/auto/corelib/kernel/qeventloop/tst_qeventloop.cpp @@ -580,7 +580,7 @@ class JobObject : public QObject public: explicit JobObject(QEventLoop *loop, QObject *parent = 0) - : QObject(parent), loop(loop), locker(loop) + : QObject(parent), locker(loop) { } @@ -606,7 +606,6 @@ signals: void done(); private: - QEventLoop *loop; QEventLoopLocker locker; }; -- cgit v1.2.3 From 126c1b4b410c1d7eaf8ed5ae26594f39e29f5296 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Wed, 17 Jul 2013 22:25:11 +0200 Subject: Don't assume Q_OS_UNIX means we support QEventLoop::X11ExcludeTimers A QCoreApplication may run a different event dispatcher, such as the QEventDispatcherBlackberry, and QGuiApplications will have the GUI dispatcher provided by the QPA plugin, such as QCocoaEventDispatcher. Neither support X11ExcludeTimers. Change-Id: Id5ea1c7dd74a127e13fa4d2eaa9a1bd2715a9dbb Reviewed-by: Gabriel de Dietrich --- tests/auto/corelib/kernel/qeventloop/qeventloop.pro | 2 ++ .../corelib/kernel/qeventloop/tst_qeventloop.cpp | 20 +++++++++++++++++--- 2 files changed, 19 insertions(+), 3 deletions(-) (limited to 'tests/auto/corelib/kernel/qeventloop') diff --git a/tests/auto/corelib/kernel/qeventloop/qeventloop.pro b/tests/auto/corelib/kernel/qeventloop/qeventloop.pro index c510052298..50329e239d 100644 --- a/tests/auto/corelib/kernel/qeventloop/qeventloop.pro +++ b/tests/auto/corelib/kernel/qeventloop/qeventloop.pro @@ -6,3 +6,5 @@ SOURCES = tst_qeventloop.cpp win32:!wince*:LIBS += -luser32 DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 + +contains(QT_CONFIG, glib): DEFINES += HAVE_GLIB diff --git a/tests/auto/corelib/kernel/qeventloop/tst_qeventloop.cpp b/tests/auto/corelib/kernel/qeventloop/tst_qeventloop.cpp index c696c6e21a..baa32e2ed5 100644 --- a/tests/auto/corelib/kernel/qeventloop/tst_qeventloop.cpp +++ b/tests/auto/corelib/kernel/qeventloop/tst_qeventloop.cpp @@ -46,6 +46,12 @@ #include #include #include +#if defined(Q_OS_UNIX) + #include + #if defined(HAVE_GLIB) + #include + #endif +#endif #include #include #include @@ -491,11 +497,19 @@ void tst_QEventLoop::processEventsExcludeTimers() QCOMPARE(timerReceiver.gotTimerEvent, timerId); timerReceiver.gotTimerEvent = -1; - // normal process events will send timers + // but not if we exclude timers eventLoop.processEvents(QEventLoop::X11ExcludeTimers); -#if !defined(Q_OS_UNIX) - QEXPECT_FAIL("", "X11ExcludeTimers only works on UN*X", Continue); + + QAbstractEventDispatcher *eventDispatcher = QCoreApplication::eventDispatcher(); +#if defined(Q_OS_UNIX) + if (!qobject_cast(eventDispatcher) + #if defined(HAVE_GLIB) + && !qobject_cast(eventDispatcher) + #endif + ) #endif + QEXPECT_FAIL("", "X11ExcludeTimers only supported in the UNIX/Glib dispatchers", Continue); + QCOMPARE(timerReceiver.gotTimerEvent, -1); timerReceiver.gotTimerEvent = -1; -- cgit v1.2.3 From 3ca9c396105212af5b84b5740fd9c09b92ab8d18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Wed, 17 Jul 2013 21:50:56 +0200 Subject: Add auto-test for running the QEventLoop test with the GUI dispatcher Follows a similar include-pattern as the qguieventdispatcher test. Change-Id: Ie8669a5bc155abd6687e81526f2b95d0d19b009e Reviewed-by: Gabriel de Dietrich --- tests/auto/corelib/kernel/qeventloop/qeventloop.pro | 2 +- tests/auto/corelib/kernel/qeventloop/tst_qeventloop.cpp | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'tests/auto/corelib/kernel/qeventloop') diff --git a/tests/auto/corelib/kernel/qeventloop/qeventloop.pro b/tests/auto/corelib/kernel/qeventloop/qeventloop.pro index 50329e239d..e5bcc31e6a 100644 --- a/tests/auto/corelib/kernel/qeventloop/qeventloop.pro +++ b/tests/auto/corelib/kernel/qeventloop/qeventloop.pro @@ -2,7 +2,7 @@ CONFIG += testcase CONFIG += parallel_test TARGET = tst_qeventloop QT = core network testlib core-private -SOURCES = tst_qeventloop.cpp +SOURCES = $$PWD/tst_qeventloop.cpp win32:!wince*:LIBS += -luser32 DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/corelib/kernel/qeventloop/tst_qeventloop.cpp b/tests/auto/corelib/kernel/qeventloop/tst_qeventloop.cpp index baa32e2ed5..df374ffc23 100644 --- a/tests/auto/corelib/kernel/qeventloop/tst_qeventloop.cpp +++ b/tests/auto/corelib/kernel/qeventloop/tst_qeventloop.cpp @@ -165,6 +165,10 @@ public slots: } }; +#ifdef QT_GUI_LIB + #define tst_QEventLoop tst_QGuiEventLoop +#endif + class tst_QEventLoop : public QObject { Q_OBJECT -- cgit v1.2.3