diff options
Diffstat (limited to 'tests/auto/dbus/qdbusinterface')
-rw-r--r-- | tests/auto/dbus/qdbusinterface/myobject.h | 7 | ||||
-rw-r--r-- | tests/auto/dbus/qdbusinterface/qmyserver/qmyserver.cpp | 5 | ||||
-rw-r--r-- | tests/auto/dbus/qdbusinterface/tst_qdbusinterface.cpp | 22 |
3 files changed, 20 insertions, 14 deletions
diff --git a/tests/auto/dbus/qdbusinterface/myobject.h b/tests/auto/dbus/qdbusinterface/myobject.h index 32da7348f2..e6f6d4a505 100644 --- a/tests/auto/dbus/qdbusinterface/myobject.h +++ b/tests/auto/dbus/qdbusinterface/myobject.h @@ -29,9 +29,10 @@ #ifndef MYOBJECT_H #define MYOBJECT_H -#include <QtCore/QObject> -#include <QtDBus/QtDBus> - +#include <QObject> +#include <QDBusMessage> +#include <QDBusContext> +#include <QDBusConnection> class MyObject: public QObject, protected QDBusContext { diff --git a/tests/auto/dbus/qdbusinterface/qmyserver/qmyserver.cpp b/tests/auto/dbus/qdbusinterface/qmyserver/qmyserver.cpp index 53eb9585f8..f7a935b1ba 100644 --- a/tests/auto/dbus/qdbusinterface/qmyserver/qmyserver.cpp +++ b/tests/auto/dbus/qdbusinterface/qmyserver/qmyserver.cpp @@ -26,8 +26,9 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#include <QtCore/QtCore> -#include <QtDBus/QtDBus> + +#include <QCoreApplication> +#include <QDBusServer> #include "../myobject.h" diff --git a/tests/auto/dbus/qdbusinterface/tst_qdbusinterface.cpp b/tests/auto/dbus/qdbusinterface/tst_qdbusinterface.cpp index 8ed8762987..0d619e9c91 100644 --- a/tests/auto/dbus/qdbusinterface/tst_qdbusinterface.cpp +++ b/tests/auto/dbus/qdbusinterface/tst_qdbusinterface.cpp @@ -25,18 +25,22 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -/* -*- C++ -*- - */ -#include <qcoreapplication.h> -#include <qmetatype.h> #include <QTest> +#include <QDebug> #include <QTestEventLoop> -#include <QtCore/qregularexpression.h> -#include <QtCore/qvariant.h> -#include <QtDBus/QtDBus> -#include <QtDBus/private/qdbus_symbols_p.h> -#include <qdebug.h> +#include <QCoreApplication> +#include <QMetaType> +#include <QRegularExpression> +#include <QVariant> +#include <QProcess> +#include <QTimer> +#include <QDBusInterface> +#include <QDBusConnectionInterface> +#include <QDBusVirtualObject> + +#include <private/qdbus_symbols_p.h> + #include "../qdbusmarshall/common.h" #include "myobject.h" |