disableopengltests

Gbp-Pq: Name disableopengltests.patch

diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index f9c1fcce918482a157b86db46c53942018d2d0c3..0d182fdc4ad5a78233997ce55dc7ce53a1483913 100644 (file)
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -11,7 +11,6 @@ SUBDIRS=\
 
 qtHaveModule(gui):qtConfig(opengl(es1|es2)?) {
     SUBDIRS += particles
-    qtHaveModule(widgets): SUBDIRS += quickwidgets
 
 }
 

diff --git a/tests/auto/qml/debugger/debugger.pro b/tests/auto/qml/debugger/debugger.pro
index a50411e18bb5a11da582043adf33c6f540eaea16..dd05886773c77db59677f40a9f504c7a33b95077 100644 (file)
--- a/tests/auto/qml/debugger/debugger.pro
+++ b/tests/auto/qml/debugger/debugger.pro
@@ -5,7 +5,6 @@ PUBLICTESTS += \
     qqmlenginedebugservice \
     qqmldebugjs \
     qqmlinspector \
-    qqmlprofilerservice \
     qpacketprotocol \
     qqmlenginedebuginspectorintegrationtest \
     qqmlenginecontrol \

diff --git a/tests/auto/qml/qml.pro b/tests/auto/qml/qml.pro
index 5073bc703e7326c5506745d25252f7d5affd4a91..84d22436f6fd2d6edd710cce6b4f9773f1059c4a 100644 (file)
--- a/tests/auto/qml/qml.pro
+++ b/tests/auto/qml/qml.pro
@@ -25,7 +25,6 @@ PUBLICTESTS += \
     qqmlmoduleplugin \
     qqmlnotifier \
     qqmlqt \
-    qqmlxmlhttprequest \
     qtqmlmodules \
     qquickfolderlistmodel \
     qqmlapplicationengine \
@@ -90,10 +89,6 @@ qtConfig(process):!boot2qt {
     SUBDIRS += qmllint qmlplugindump
 }
 
-qtConfig(library) {
-    SUBDIRS += qqmlextensionplugin
-}
-
 qtConfig(private_tests): \
     SUBDIRS += $$PRIVATETESTS
 

diff --git a/tests/auto/quick/quick.pro b/tests/auto/quick/quick.pro
index 0f904e0c0977950cc9f69c02dcc84f145cc143b8..37f260815336d42051c32b2eec6cb9c84b43da4c 100644 (file)
--- a/tests/auto/quick/quick.pro
+++ b/tests/auto/quick/quick.pro
@@ -6,9 +6,7 @@ PUBLICTESTS += \
 
 qtConfig(opengl(es1|es2)?) {
     PUBLICTESTS += \
-        drawingmodes \
-        rendernode
-    qtHaveModule(widgets): PUBLICTESTS += nodes
+        drawingmodes
 
     QUICKTESTS += \
         qquickanimatedsprite \