diff options
| author | Ivan Komissarov <ABBAPOH@gmail.com> | 2021-09-26 12:45:39 +0200 |
|---|---|---|
| committer | Ivan Komissarov <ABBAPOH@gmail.com> | 2021-09-27 11:21:36 +0000 |
| commit | 60cbf03195e3a5424c2104d2e4493826d8354a53 (patch) | |
| tree | dd29d609291b6f6bacb2de0d5fdf6017d0398630 /tests | |
| parent | 21107508c9b6ae57a221d6ccad2941d395c52b89 (diff) | |
Don't use global includes in dbus tests
Otherwise, we pull in dependency on the GL.h header which is
not needed otherwise.
Change-Id: I7cca190ca3883f9203403c8cff21f6a0d274171c
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'tests')
3 files changed, 5 insertions, 12 deletions
diff --git a/tests/auto/blackbox/testdata-qt/dbus-adaptors/car.cpp b/tests/auto/blackbox/testdata-qt/dbus-adaptors/car.cpp index f67e4c193..ce1d33ed6 100644 --- a/tests/auto/blackbox/testdata-qt/dbus-adaptors/car.cpp +++ b/tests/auto/blackbox/testdata-qt/dbus-adaptors/car.cpp @@ -50,11 +50,8 @@ #include "car.h" -#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)) -#include <QtWidgets/QtWidgets> -#else -#include <QtGui> -#endif +#include <QtGui/QPainter> + #include <math.h> static const double Pi = 3.14159265358979323846264338327950288419717; diff --git a/tests/auto/blackbox/testdata-qt/dbus-interfaces/controller.cpp b/tests/auto/blackbox/testdata-qt/dbus-interfaces/controller.cpp index f6680676a..0f7a77efa 100644 --- a/tests/auto/blackbox/testdata-qt/dbus-interfaces/controller.cpp +++ b/tests/auto/blackbox/testdata-qt/dbus-interfaces/controller.cpp @@ -49,11 +49,7 @@ ****************************************************************************/ #include <QtGlobal> -#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)) -#include <QtWidgets> -#else -#include <QtGui> -#endif +#include <QtDBus/QDBusConnection> #include "controller.h" #include "car_interface.h" diff --git a/tests/auto/blackbox/testdata-qt/dbus-interfaces/main.cpp b/tests/auto/blackbox/testdata-qt/dbus-interfaces/main.cpp index 5ceba5a9f..c4e6ee485 100644 --- a/tests/auto/blackbox/testdata-qt/dbus-interfaces/main.cpp +++ b/tests/auto/blackbox/testdata-qt/dbus-interfaces/main.cpp @@ -50,9 +50,9 @@ #include <QtGlobal> #if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)) -#include <QtWidgets> +#include <QtWidgets/QApplication> #else -#include <QtGui> +#include <QtGui/QApplication>> #endif #include <QtDBus> |