diff options
Diffstat (limited to 'tests/auto/dbus')
20 files changed, 33 insertions, 20 deletions
diff --git a/tests/auto/dbus/qdbusabstractadaptor/tst_qdbusabstractadaptor.cpp b/tests/auto/dbus/qdbusabstractadaptor/tst_qdbusabstractadaptor.cpp index fed87cc438..fd74f45336 100644 --- a/tests/auto/dbus/qdbusabstractadaptor/tst_qdbusabstractadaptor.cpp +++ b/tests/auto/dbus/qdbusabstractadaptor/tst_qdbusabstractadaptor.cpp @@ -29,7 +29,7 @@ #include <qcoreapplication.h> #include <qdebug.h> -#include <QtTest/QtTest> +#include <QTest> #include <QtDBus> diff --git a/tests/auto/dbus/qdbusabstractinterface/tst_qdbusabstractinterface.cpp b/tests/auto/dbus/qdbusabstractinterface/tst_qdbusabstractinterface.cpp index 615b25e01a..613baaab41 100644 --- a/tests/auto/dbus/qdbusabstractinterface/tst_qdbusabstractinterface.cpp +++ b/tests/auto/dbus/qdbusabstractinterface/tst_qdbusabstractinterface.cpp @@ -30,7 +30,9 @@ #include <qdebug.h> #include <qsharedpointer.h> -#include <QtTest/QtTest> +#include <QTest> +#include <QTestEventLoop> +#include <QSignalSpy> #include <QtDBus> diff --git a/tests/auto/dbus/qdbusconnection/tst_qdbusconnection.cpp b/tests/auto/dbus/qdbusconnection/tst_qdbusconnection.cpp index 77ae6f154d..314a23f987 100644 --- a/tests/auto/dbus/qdbusconnection/tst_qdbusconnection.cpp +++ b/tests/auto/dbus/qdbusconnection/tst_qdbusconnection.cpp @@ -32,7 +32,8 @@ #include <qcoreapplication.h> #include <qdebug.h> -#include <QtTest/QtTest> +#include <QTest> + #include <QtDBus/QtDBus> #ifdef Q_OS_UNIX diff --git a/tests/auto/dbus/qdbusconnection/tst_qdbusconnection.h b/tests/auto/dbus/qdbusconnection/tst_qdbusconnection.h index 14a7243cf0..d87d0e3773 100644 --- a/tests/auto/dbus/qdbusconnection/tst_qdbusconnection.h +++ b/tests/auto/dbus/qdbusconnection/tst_qdbusconnection.h @@ -32,7 +32,8 @@ #include <QObject> #include <QtDBus/QtDBus> -#include <QtTest/QtTest> +#include <QTest> +#include <QTestEventLoop> class BaseObject: public QObject { diff --git a/tests/auto/dbus/qdbusconnection_delayed/tst_qdbusconnection_delayed.cpp b/tests/auto/dbus/qdbusconnection_delayed/tst_qdbusconnection_delayed.cpp index 5f54dff39b..a150451d34 100644 --- a/tests/auto/dbus/qdbusconnection_delayed/tst_qdbusconnection_delayed.cpp +++ b/tests/auto/dbus/qdbusconnection_delayed/tst_qdbusconnection_delayed.cpp @@ -27,7 +27,8 @@ ****************************************************************************/ #include <QtDBus> -#include <QtTest> +#include <QTest> +#include <QTestEventLoop> #ifdef Q_OS_WIN # include <process.h> diff --git a/tests/auto/dbus/qdbusconnection_no_bus/tst_qdbusconnection_no_bus.cpp b/tests/auto/dbus/qdbusconnection_no_bus/tst_qdbusconnection_no_bus.cpp index f97f891ff8..845360c93d 100644 --- a/tests/auto/dbus/qdbusconnection_no_bus/tst_qdbusconnection_no_bus.cpp +++ b/tests/auto/dbus/qdbusconnection_no_bus/tst_qdbusconnection_no_bus.cpp @@ -28,7 +28,7 @@ #include <qcoreapplication.h> #include <qdebug.h> -#include <QtTest/QtTest> +#include <QTest> #include <QtDBus/QtDBus> #include <stdlib.h> diff --git a/tests/auto/dbus/qdbusconnection_no_libdbus/tst_qdbusconnection_no_libdbus.cpp b/tests/auto/dbus/qdbusconnection_no_libdbus/tst_qdbusconnection_no_libdbus.cpp index e93b8aa609..cf306a7eb4 100644 --- a/tests/auto/dbus/qdbusconnection_no_libdbus/tst_qdbusconnection_no_libdbus.cpp +++ b/tests/auto/dbus/qdbusconnection_no_libdbus/tst_qdbusconnection_no_libdbus.cpp @@ -28,7 +28,7 @@ #include <qcoreapplication.h> #include <qdebug.h> -#include <QtTest/QtTest> +#include <QTest> #include <QtDBus/QtDBus> #include <stdlib.h> diff --git a/tests/auto/dbus/qdbuscontext/tst_qdbuscontext.cpp b/tests/auto/dbus/qdbuscontext/tst_qdbuscontext.cpp index cd49a7c742..af1c64336d 100644 --- a/tests/auto/dbus/qdbuscontext/tst_qdbuscontext.cpp +++ b/tests/auto/dbus/qdbuscontext/tst_qdbuscontext.cpp @@ -26,7 +26,7 @@ ** ****************************************************************************/ #include <QtDBus> -#include <QtTest> +#include <QTest> const char errorName[] = "org.qtproject.tst_QDBusContext.Error"; const char errorMsg[] = "A generic error"; diff --git a/tests/auto/dbus/qdbusinterface/tst_qdbusinterface.cpp b/tests/auto/dbus/qdbusinterface/tst_qdbusinterface.cpp index 4cf2a81c6b..8ed8762987 100644 --- a/tests/auto/dbus/qdbusinterface/tst_qdbusinterface.cpp +++ b/tests/auto/dbus/qdbusinterface/tst_qdbusinterface.cpp @@ -30,7 +30,8 @@ #include <qcoreapplication.h> #include <qmetatype.h> -#include <QtTest/QtTest> +#include <QTest> +#include <QTestEventLoop> #include <QtCore/qregularexpression.h> #include <QtCore/qvariant.h> #include <QtDBus/QtDBus> diff --git a/tests/auto/dbus/qdbuslocalcalls/tst_qdbuslocalcalls.cpp b/tests/auto/dbus/qdbuslocalcalls/tst_qdbuslocalcalls.cpp index 90e0421883..705e1e065d 100644 --- a/tests/auto/dbus/qdbuslocalcalls/tst_qdbuslocalcalls.cpp +++ b/tests/auto/dbus/qdbuslocalcalls/tst_qdbuslocalcalls.cpp @@ -29,7 +29,8 @@ #include <QtCore/QVariant> #include <QtCore/QList> #include <QtCore/QList> -#include <QtTest/QtTest> +#include <QTest> +#include <QTestEventLoop> #include <QtDBus> diff --git a/tests/auto/dbus/qdbusmarshall/tst_qdbusmarshall.cpp b/tests/auto/dbus/qdbusmarshall/tst_qdbusmarshall.cpp index aaa6e22392..9078ef02ab 100644 --- a/tests/auto/dbus/qdbusmarshall/tst_qdbusmarshall.cpp +++ b/tests/auto/dbus/qdbusmarshall/tst_qdbusmarshall.cpp @@ -27,7 +27,9 @@ ** ****************************************************************************/ #include <QtCore/QtCore> -#include <QtTest/QtTest> +#include <QTest> +#include <QTestEventLoop> + #include <QtDBus/QtDBus> #include "common.h" diff --git a/tests/auto/dbus/qdbusmetaobject/tst_qdbusmetaobject.cpp b/tests/auto/dbus/qdbusmetaobject/tst_qdbusmetaobject.cpp index ae0f7a4140..059b8cd483 100644 --- a/tests/auto/dbus/qdbusmetaobject/tst_qdbusmetaobject.cpp +++ b/tests/auto/dbus/qdbusmetaobject/tst_qdbusmetaobject.cpp @@ -27,7 +27,7 @@ ****************************************************************************/ #include <qcoreapplication.h> #include <qmetatype.h> -#include <QtTest/QtTest> +#include <QTest> #include <QtDBus/QtDBus> #include <private/qdbusmetaobject_p.h> diff --git a/tests/auto/dbus/qdbusmetatype/tst_qdbusmetatype.cpp b/tests/auto/dbus/qdbusmetatype/tst_qdbusmetatype.cpp index 4fd8b8103f..7bc6637a08 100644 --- a/tests/auto/dbus/qdbusmetatype/tst_qdbusmetatype.cpp +++ b/tests/auto/dbus/qdbusmetatype/tst_qdbusmetatype.cpp @@ -27,7 +27,7 @@ ****************************************************************************/ #include <qcoreapplication.h> #include <qmetatype.h> -#include <QtTest/QtTest> +#include <QTest> #include <QtDBus/QtDBus> diff --git a/tests/auto/dbus/qdbuspendingcall/tst_qdbuspendingcall.cpp b/tests/auto/dbus/qdbuspendingcall/tst_qdbuspendingcall.cpp index 818579932b..474f9b9119 100644 --- a/tests/auto/dbus/qdbuspendingcall/tst_qdbuspendingcall.cpp +++ b/tests/auto/dbus/qdbuspendingcall/tst_qdbuspendingcall.cpp @@ -30,7 +30,8 @@ #include <QtCore/QVariant> #include <QtCore/QList> #include <QtCore/QThread> -#include <QtTest/QtTest> +#include <QTest> +#include <QTestEventLoop> #include <QtDBus> #define TEST_INTERFACE_NAME "org.qtproject.QtDBus.MyObject" diff --git a/tests/auto/dbus/qdbuspendingreply/tst_qdbuspendingreply.cpp b/tests/auto/dbus/qdbuspendingreply/tst_qdbuspendingreply.cpp index 2648b22f1f..647749da8e 100644 --- a/tests/auto/dbus/qdbuspendingreply/tst_qdbuspendingreply.cpp +++ b/tests/auto/dbus/qdbuspendingreply/tst_qdbuspendingreply.cpp @@ -28,7 +28,7 @@ #include <QtCore/QObject> #include <QtCore/QVariant> #include <QtCore/QList> -#include <QtTest/QtTest> +#include <QTest> #include <QtDBus> typedef QMap<int,QString> IntStringMap; diff --git a/tests/auto/dbus/qdbusreply/tst_qdbusreply.cpp b/tests/auto/dbus/qdbusreply/tst_qdbusreply.cpp index 362cbab902..c68f0e4300 100644 --- a/tests/auto/dbus/qdbusreply/tst_qdbusreply.cpp +++ b/tests/auto/dbus/qdbusreply/tst_qdbusreply.cpp @@ -29,7 +29,7 @@ #include <qdebug.h> #include <qvariant.h> -#include <QtTest/QtTest> +#include <QTest> #include <QtDBus> diff --git a/tests/auto/dbus/qdbusservicewatcher/tst_qdbusservicewatcher.cpp b/tests/auto/dbus/qdbusservicewatcher/tst_qdbusservicewatcher.cpp index 1ba7ee51b1..d1ebabdad3 100644 --- a/tests/auto/dbus/qdbusservicewatcher/tst_qdbusservicewatcher.cpp +++ b/tests/auto/dbus/qdbusservicewatcher/tst_qdbusservicewatcher.cpp @@ -29,7 +29,9 @@ #include <QtDBus/QDBusServiceWatcher> #include <QtDBus> -#include <QtTest> +#include <QTest> +#include <QSignalSpy> +#include <QTestEventLoop> class tst_QDBusServiceWatcher: public QObject { diff --git a/tests/auto/dbus/qdbusthreading/tst_qdbusthreading.cpp b/tests/auto/dbus/qdbusthreading/tst_qdbusthreading.cpp index 13c2c2bb61..9c12dc8235 100644 --- a/tests/auto/dbus/qdbusthreading/tst_qdbusthreading.cpp +++ b/tests/auto/dbus/qdbusthreading/tst_qdbusthreading.cpp @@ -25,7 +25,8 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#include <QtTest> +#include <QTest> +#include <QTestEventLoop> #include <QtDBus> #include <QtCore/QVarLengthArray> #include <QtCore/QThread> diff --git a/tests/auto/dbus/qdbustype/tst_qdbustype.cpp b/tests/auto/dbus/qdbustype/tst_qdbustype.cpp index d7e4b9edcf..de48210b26 100644 --- a/tests/auto/dbus/qdbustype/tst_qdbustype.cpp +++ b/tests/auto/dbus/qdbustype/tst_qdbustype.cpp @@ -27,7 +27,7 @@ ** ****************************************************************************/ -#include <QtTest/QtTest> +#include <QTest> #include <QtCore/QCoreApplication> #include <QtDBus/private/qdbusutil_p.h> diff --git a/tests/auto/dbus/qdbusxmlparser/tst_qdbusxmlparser.cpp b/tests/auto/dbus/qdbusxmlparser/tst_qdbusxmlparser.cpp index 264dbe127f..2867b64595 100644 --- a/tests/auto/dbus/qdbusxmlparser/tst_qdbusxmlparser.cpp +++ b/tests/auto/dbus/qdbusxmlparser/tst_qdbusxmlparser.cpp @@ -29,7 +29,7 @@ */ #include <qcoreapplication.h> #include <qmetatype.h> -#include <QtTest/QtTest> +#include <QTest> #include <QtDBus/QtDBus> #include <QtXml/QDomDocument> |