disableopengltests

Gbp-Pq: Name disableopengltests.patch

diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index 1e80f1bf65b240f001fa1556ae863559d4595e3f..591fe272585dc85ce2097b0257feab49cea2b02e 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 63721cc575fdb77214cb005654095d0375da5f01..e641eaddf77357a1ede0f4ef09aabc2c58a6fa54 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 3433b568641a50bd5104b4a3da09d2f0c9cb69b2..54c9d6042b3cb1534b24f308c3b841b3dfbf22ca 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) {
     }
 }
 
-qtConfig(library) {
-    SUBDIRS += qqmlextensionplugin
-}
-
 qtConfig(private_tests): \
     SUBDIRS += $$PRIVATETESTS
 

diff --git a/tests/auto/quick/quick.pro b/tests/auto/quick/quick.pro
index a54a707f4a9d824f64a3df627d06f2d2d4186bc2..73d3ba6b612f5d0e2494a8a1b31a75c04c520c75 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 \