summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorEdward Welbourne <edward.welbourne@qt.io>2018-08-08 14:20:34 +0200
committerEdward Welbourne <edward.welbourne@qt.io>2018-08-14 14:43:45 +0000
commitb74e93a9b07243da4f3d2784cde49916de455364 (patch)
treec68a57afbdaa052bd3971e675e30a45bfa935a75 /tests
parent0358558a3a22c0fdb586de95e4c48bced96ff6c5 (diff)
Remove support for GPU_BLACKLIST files from some tests
The feature has long been unused and support for it shall soon be dropped. Change-Id: Ia82082fa6cd2d83d461b6db40670dd541015e9f2 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/quick/qmltests/tst_qmltests.cpp1
-rw-r--r--tests/auto/widgets/util.h4
2 files changed, 0 insertions, 5 deletions
diff --git a/tests/auto/quick/qmltests/tst_qmltests.cpp b/tests/auto/quick/qmltests/tst_qmltests.cpp
index 2aa24b76c..ba7a992db 100644
--- a/tests/auto/quick/qmltests/tst_qmltests.cpp
+++ b/tests/auto/quick/qmltests/tst_qmltests.cpp
@@ -128,7 +128,6 @@ int main(int argc, char **argv)
QtWebEngine::initialize();
QQuickWebEngineProfile::defaultProfile()->setOffTheRecord(true);
- QTEST_ADD_GPU_BLACKLIST_SUPPORT_DEFS
QTEST_SET_MAIN_SOURCE_PATH
int i = quick_test_main(argc, argv, "qmltests", QUICK_TEST_SOURCE_DIR);
diff --git a/tests/auto/widgets/util.h b/tests/auto/widgets/util.h
index ab3b9e6b9..f27466225 100644
--- a/tests/auto/widgets/util.h
+++ b/tests/auto/widgets/util.h
@@ -160,9 +160,6 @@ static inline QUrl baseUrlSync(QWebEnginePage *page)
#define W_QSKIP(a, b) QSKIP(a)
#define W_QTEST_MAIN(TestObject, params) \
-QT_BEGIN_NAMESPACE \
-QTEST_ADD_GPU_BLACKLIST_SUPPORT_DEFS \
-QT_END_NAMESPACE \
int main(int argc, char *argv[]) \
{ \
QVector<const char *> w_argv(argc); \
@@ -175,7 +172,6 @@ int main(int argc, char *argv[]) \
QApplication app(w_argc, const_cast<char **>(w_argv.data())); \
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); \