summaryrefslogtreecommitdiffstats
path: root/tests/auto/dbus/qdbusmarshall/common.h
diff options
context:
space:
mode:
authorDavid Skoland <david.skoland@qt.io>2021-01-08 12:57:47 +0100
committerDavid Skoland <david.skoland@qt.io>2021-01-12 09:19:27 +0100
commit9e09677c1dd4da92735736a0fbcb703416bf4d6d (patch)
treeac921250db4b53b20101dd5f1aa0f3e9c83db8a2 /tests/auto/dbus/qdbusmarshall/common.h
parent6a3f8cbc3ad47d8585aac25d3775ed2350afe20c (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/auto/dbus/qdbusmarshall/common.h')
-rw-r--r--tests/auto/dbus/qdbusmarshall/common.h14
1 files changed, 12 insertions, 2 deletions
diff --git a/tests/auto/dbus/qdbusmarshall/common.h b/tests/auto/dbus/qdbusmarshall/common.h
index 3dfe3e39bb..9bdc1ebe66 100644
--- a/tests/auto/dbus/qdbusmarshall/common.h
+++ b/tests/auto/dbus/qdbusmarshall/common.h
@@ -25,8 +25,18 @@
** $QT_END_LICENSE$
**
****************************************************************************/
-#include <qmath.h> // qIsNan
-#include <qvariant.h>
+
+#include <QtGlobal>
+#include <QMap>
+#include <QString>
+#include <QVariant>
+#include <QDateTime>
+#include <QLine>
+#include <QDBusObjectPath>
+#include <QDBusSignature>
+#include <QDBusUnixFileDescriptor>
+#include <QDBusArgument>
+#include <QDBusMetaType>
#ifdef Q_OS_UNIX
# include <private/qcore_unix_p.h>