diff options
| author | David Skoland <david.skoland@qt.io> | 2021-01-08 12:57:47 +0100 |
|---|---|---|
| committer | David Skoland <david.skoland@qt.io> | 2021-01-12 09:19:27 +0100 |
| commit | 9e09677c1dd4da92735736a0fbcb703416bf4d6d (patch) | |
| tree | ac921250db4b53b20101dd5f1aa0f3e9c83db8a2 /tests/benchmarks | |
| parent | 6a3f8cbc3ad47d8585aac25d3775ed2350afe20c (diff) | |
Remove QtDBus includes
Per the discussion of QTBUG-88831, we determined that module-wide
imports are unfortunate, especially for compile times. Following this,
all QtDBus includes have been replaced with the headers for the classes
actually used in each file. Additionally, some cleanup of header file
order and format has been performed in the changed files.
Pick-to: 6.0
Change-Id: I62c1b75682a48422f0ba1168dd5d7bd0952808ac
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Diffstat (limited to 'tests/benchmarks')
3 files changed, 8 insertions, 4 deletions
diff --git a/tests/benchmarks/dbus/qdbusperformance/server/server.cpp b/tests/benchmarks/dbus/qdbusperformance/server/server.cpp index 6f0bca8bb1..3831a62f71 100644 --- a/tests/benchmarks/dbus/qdbusperformance/server/server.cpp +++ b/tests/benchmarks/dbus/qdbusperformance/server/server.cpp @@ -26,7 +26,7 @@ ** ****************************************************************************/ #include <QtCore/QtCore> -#include <QtDBus/QtDBus> + #include "../serverobject.h" diff --git a/tests/benchmarks/dbus/qdbusperformance/serverobject.h b/tests/benchmarks/dbus/qdbusperformance/serverobject.h index f3c2d96f02..b7ef2991c2 100644 --- a/tests/benchmarks/dbus/qdbusperformance/serverobject.h +++ b/tests/benchmarks/dbus/qdbusperformance/serverobject.h @@ -31,7 +31,8 @@ #define SERVEROBJECT_H #include <QObject> -#include <QtDBus/QtDBus> +#include <QDBusConnection> +#include <QDBusVariant> class ServerObject: public QObject { diff --git a/tests/benchmarks/dbus/qdbusperformance/tst_qdbusperformance.cpp b/tests/benchmarks/dbus/qdbusperformance/tst_qdbusperformance.cpp index 60d6ba88cb..1f76c413be 100644 --- a/tests/benchmarks/dbus/qdbusperformance/tst_qdbusperformance.cpp +++ b/tests/benchmarks/dbus/qdbusperformance/tst_qdbusperformance.cpp @@ -25,10 +25,13 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#include <QtCore/QtCore> + #include <QTest> #include <QTestEventLoop> -#include <QtDBus/QtDBus> +#include <QProcess> +#include <QDBusServiceWatcher> +#include <QDBusConnectionInterface> +#include <QDBusInterface> #include "./serverobject.h" |