summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--tests/auto/gui.pro1
-rw-r--r--tests/auto/gui/gui.pro2
-rw-r--r--tests/auto/gui/kernel/kernel.pro5
-rw-r--r--tests/auto/gui/kernel/qscreen/qscreen.pro (renamed from tests/auto/qscreen/qscreen.pro)1
-rw-r--r--tests/auto/gui/kernel/qscreen/tst_qscreen.cpp (renamed from tests/auto/qscreen/tst_qscreen.cpp)0
-rw-r--r--tests/auto/gui/kernel/qwindow/qwindow.pro (renamed from tests/auto/qwindow/qwindow.pro)0
-rw-r--r--tests/auto/gui/kernel/qwindow/tst_qwindow.cpp (renamed from tests/auto/qwindow/tst_qwindow.cpp)0
-rw-r--r--tests/auto/gui/qopengl/qopengl.pro (renamed from tests/auto/qopengl/qopengl.pro)0
-rw-r--r--tests/auto/gui/qopengl/tst_qopengl.cpp (renamed from tests/auto/qopengl/tst_qopengl.cpp)0
-rw-r--r--tests/auto/opengl/opengl.pro3
10 files changed, 6 insertions, 6 deletions
diff --git a/tests/auto/gui.pro b/tests/auto/gui.pro
index 4f684869f4..2a954e7977 100644
--- a/tests/auto/gui.pro
+++ b/tests/auto/gui.pro
@@ -6,7 +6,6 @@
TEMPLATE=subdirs
SUBDIRS=\
gui \
- qopengl \
qtransformedscreen \
qwindowsurface \
qwsembedwidget \
diff --git a/tests/auto/gui/gui.pro b/tests/auto/gui/gui.pro
index d54198467d..48fa2772f9 100644
--- a/tests/auto/gui/gui.pro
+++ b/tests/auto/gui/gui.pro
@@ -4,6 +4,6 @@ SUBDIRS=\
kernel \
math3d \
painting \
+ qopengl \
text \
util \
-
diff --git a/tests/auto/gui/kernel/kernel.pro b/tests/auto/gui/kernel/kernel.pro
index 16bda68629..e473463828 100644
--- a/tests/auto/gui/kernel/kernel.pro
+++ b/tests/auto/gui/kernel/kernel.pro
@@ -4,13 +4,14 @@ SUBDIRS=\
qdrag \
qevent \
qfileopenevent \
- qinputpanel \
qguimetatype \
qguivariant \
+ qinputpanel \
qkeysequence \
qmouseevent \
qmouseevent_modal \
qpalette \
+ qscreen \
qshortcut \
qtouchevent \
-
+ qwindow \
diff --git a/tests/auto/qscreen/qscreen.pro b/tests/auto/gui/kernel/qscreen/qscreen.pro
index be3a89867d..4ed8eefa1a 100644
--- a/tests/auto/qscreen/qscreen.pro
+++ b/tests/auto/gui/kernel/qscreen/qscreen.pro
@@ -5,3 +5,4 @@ QT += core-private gui-private testlib
SOURCES += tst_qscreen.cpp
+CONFIG += insignificant_test # QTBUG-22554
diff --git a/tests/auto/qscreen/tst_qscreen.cpp b/tests/auto/gui/kernel/qscreen/tst_qscreen.cpp
index 1d00032b56..1d00032b56 100644
--- a/tests/auto/qscreen/tst_qscreen.cpp
+++ b/tests/auto/gui/kernel/qscreen/tst_qscreen.cpp
diff --git a/tests/auto/qwindow/qwindow.pro b/tests/auto/gui/kernel/qwindow/qwindow.pro
index 9fb49e8ceb..9fb49e8ceb 100644
--- a/tests/auto/qwindow/qwindow.pro
+++ b/tests/auto/gui/kernel/qwindow/qwindow.pro
diff --git a/tests/auto/qwindow/tst_qwindow.cpp b/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp
index 4171f0f797..4171f0f797 100644
--- a/tests/auto/qwindow/tst_qwindow.cpp
+++ b/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp
diff --git a/tests/auto/qopengl/qopengl.pro b/tests/auto/gui/qopengl/qopengl.pro
index f281c6c439..f281c6c439 100644
--- a/tests/auto/qopengl/qopengl.pro
+++ b/tests/auto/gui/qopengl/qopengl.pro
diff --git a/tests/auto/qopengl/tst_qopengl.cpp b/tests/auto/gui/qopengl/tst_qopengl.cpp
index ebff56fd5c..ebff56fd5c 100644
--- a/tests/auto/qopengl/tst_qopengl.cpp
+++ b/tests/auto/gui/qopengl/tst_qopengl.cpp
diff --git a/tests/auto/opengl/opengl.pro b/tests/auto/opengl/opengl.pro
index 6c8e4ca96b..963cda170d 100644
--- a/tests/auto/opengl/opengl.pro
+++ b/tests/auto/opengl/opengl.pro
@@ -1,7 +1,6 @@
TEMPLATE=subdirs
SUBDIRS=\
qgl \
- qglthreads \
qglbuffer \
qglfunctions \
-
+ qglthreads \