aboutsummaryrefslogtreecommitdiffstats
path: root/src/qmltest
diff options
context:
space:
mode:
authorRobin Burchell <robin.burchell@crimson.no>2018-05-24 22:49:48 +0200
committerRobin Burchell <robin.burchell@crimson.no>2018-05-25 07:51:13 +0000
commit8390b610401f42d239eee3390052cf685f47335d (patch)
tree97d7b5b465c4ede3a5f33a97c49332a1bd8a9f73 /src/qmltest
parent1e755ff21469d817481af8feed792569ab2c2bb8 (diff)
qtestoptions_p: Restore compatibility with older Qt
This isn't mandatory to keep forever, but having the ability to run newer qtdeclarative against older qtbase is nice, if there haven't been gigantic changes, e.g. for bisecting's sake or partial upgrades. Change-Id: Ia4de4b0cc5092619e2d9f661bb7f43da690a0fdf Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'src/qmltest')
-rw-r--r--src/qmltest/qtestoptions_p.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/qmltest/qtestoptions_p.h b/src/qmltest/qtestoptions_p.h
index 68fe09f793..7be5c88590 100644
--- a/src/qmltest/qtestoptions_p.h
+++ b/src/qmltest/qtestoptions_p.h
@@ -51,7 +51,11 @@
// We mean it.
//
-#include <QtTest/qttestglobal.h>
+#if QT_VERSION < QT_VERSION_CHECK(5, 11, 0)
+# include <QtTest/qtest_global.h>
+#else
+# include <QtTest/qttestglobal.h>
+#endif
#include <QtCore/qstring.h>
#include <QtCore/qstringlist.h>