diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2018-08-08 14:08:15 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2018-10-12 13:59:41 +0000 |
| commit | 641eb4a96552615d898512723e2093abcaf7fbc1 (patch) | |
| tree | 700f98405875b09ed5acbbac8665cb1c210b9a63 /src/testlib/qtest.h | |
| parent | b6427ded65cd8ec031547ae0aeaa7a31f3c6a4b1 (diff) | |
Remove GPU_BLACKLIST support from QTest
This reverts 4fe68ffbe5c93244562f2b56292d4ecf5ce39f56,
1dfc16f6dad1cfbd843af5ca91bbb8e02774930d and
9545bee98a2431d4ef4c3449631a5fcb8d9bd57a; this feature has not been in
use for some time, so is just dead code.
[ChangeLog][QtTestLib] Removed support for GPU_BLACKLIST files.
Reimplementations or equivalents of QTEST_MAIN() should remove their
uses of QTEST_ADD_GPU_BLACKLIST_SUPPORT and its _DEFS; they are still
vacuously defined, but serve no remaining purpose and shall be
undefined in due course.
Change-Id: I94ffd5c37ce4e1f7cf25d3c7ae8d40696b74c911
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
Diffstat (limited to 'src/testlib/qtest.h')
| -rw-r--r-- | src/testlib/qtest.h | 25 |
1 files changed, 5 insertions, 20 deletions
diff --git a/src/testlib/qtest.h b/src/testlib/qtest.h index 2578037946..82078ad7a8 100644 --- a/src/testlib/qtest.h +++ b/src/testlib/qtest.h @@ -368,18 +368,11 @@ int main(int argc, char *argv[]) \ } #include <QtTest/qtestsystem.h> -#include <set> - -#ifndef QT_NO_OPENGL -# define QTEST_ADD_GPU_BLACKLIST_SUPPORT_DEFS \ - extern Q_TESTLIB_EXPORT std::set<QByteArray> *(*qgpu_features_ptr)(const QString &); \ - extern Q_GUI_EXPORT std::set<QByteArray> *qgpu_features(const QString &); -# define QTEST_ADD_GPU_BLACKLIST_SUPPORT \ - qgpu_features_ptr = qgpu_features; -#else -# define QTEST_ADD_GPU_BLACKLIST_SUPPORT_DEFS -# define QTEST_ADD_GPU_BLACKLIST_SUPPORT -#endif + +// Two backwards-compatibility defines for an obsolete feature: +#define QTEST_ADD_GPU_BLACKLIST_SUPPORT_DEFS +#define QTEST_ADD_GPU_BLACKLIST_SUPPORT +// ### Qt 6: fully remove these. #if defined(QT_NETWORK_LIB) # include <QtTest/qtest_network.h> @@ -396,15 +389,11 @@ int main(int argc, char *argv[]) \ #endif #define QTEST_MAIN(TestObject) \ -QT_BEGIN_NAMESPACE \ -QTEST_ADD_GPU_BLACKLIST_SUPPORT_DEFS \ -QT_END_NAMESPACE \ int main(int argc, char *argv[]) \ { \ QApplication app(argc, argv); \ app.setAttribute(Qt::AA_Use96Dpi, true); \ QTEST_DISABLE_KEYPAD_NAVIGATION \ - QTEST_ADD_GPU_BLACKLIST_SUPPORT \ TestObject tc; \ QTEST_SET_MAIN_SOURCE_PATH \ return QTest::qExec(&tc, argc, argv); \ @@ -415,14 +404,10 @@ int main(int argc, char *argv[]) \ #include <QtTest/qtest_gui.h> #define QTEST_MAIN(TestObject) \ -QT_BEGIN_NAMESPACE \ -QTEST_ADD_GPU_BLACKLIST_SUPPORT_DEFS \ -QT_END_NAMESPACE \ int main(int argc, char *argv[]) \ { \ QGuiApplication app(argc, argv); \ app.setAttribute(Qt::AA_Use96Dpi, true); \ - QTEST_ADD_GPU_BLACKLIST_SUPPORT \ TestObject tc; \ QTEST_SET_MAIN_SOURCE_PATH \ return QTest::qExec(&tc, argc, argv); \ |