diff options
-rw-r--r-- | tests/auto/auto.pro | 2 | ||||
-rw-r--r-- | tests/auto/opengl/opengl.pro (renamed from tests/auto/opengl.pro) | 0 | ||||
-rw-r--r-- | tests/auto/opengl/qgl/.gitignore (renamed from tests/auto/qgl/.gitignore) | 0 | ||||
-rw-r--r-- | tests/auto/opengl/qgl/qgl.pro (renamed from tests/auto/qgl/qgl.pro) | 0 | ||||
-rw-r--r-- | tests/auto/opengl/qgl/qgl.qrc | 5 | ||||
-rw-r--r-- | tests/auto/opengl/qgl/tst_qgl.cpp (renamed from tests/auto/qgl/tst_qgl.cpp) | 0 | ||||
-rw-r--r-- | tests/auto/opengl/qglbuffer/qglbuffer.pro (renamed from tests/auto/qglbuffer/qglbuffer.pro) | 0 | ||||
-rw-r--r-- | tests/auto/opengl/qglbuffer/tst_qglbuffer.cpp (renamed from tests/auto/qglbuffer/tst_qglbuffer.cpp) | 0 | ||||
-rw-r--r-- | tests/auto/opengl/qglfunctions/qglfunctions.pro (renamed from tests/auto/qglfunctions/qglfunctions.pro) | 0 | ||||
-rw-r--r-- | tests/auto/opengl/qglfunctions/tst_qglfunctions.cpp (renamed from tests/auto/qglfunctions/tst_qglfunctions.cpp) | 0 | ||||
-rw-r--r-- | tests/auto/opengl/qglthreads/qglthreads.pro (renamed from tests/auto/qglthreads/qglthreads.pro) | 0 | ||||
-rw-r--r-- | tests/auto/opengl/qglthreads/tst_qglthreads.cpp (renamed from tests/auto/qglthreads/tst_qglthreads.cpp) | 0 | ||||
-rw-r--r-- | tests/auto/opengl/qglthreads/tst_qglthreads.h (renamed from tests/auto/qglthreads/tst_qglthreads.h) | 0 | ||||
-rw-r--r-- | tests/auto/qgl/qgl.qrc | 5 |
14 files changed, 6 insertions, 6 deletions
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index c2f58835a9..c16f00ff8b 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -9,6 +9,6 @@ SUBDIRS += \ other !cross_compile: SUBDIRS += host.pro -contains(QT_CONFIG, opengl): SUBDIRS += opengl.pro +contains(QT_CONFIG, opengl): SUBDIRS += opengl unix:!embedded:contains(QT_CONFIG, dbus): SUBDIRS += dbus contains(QT_CONFIG, v8): SUBDIRS += v8.pro diff --git a/tests/auto/opengl.pro b/tests/auto/opengl/opengl.pro index 6c8e4ca96b..6c8e4ca96b 100644 --- a/tests/auto/opengl.pro +++ b/tests/auto/opengl/opengl.pro diff --git a/tests/auto/qgl/.gitignore b/tests/auto/opengl/qgl/.gitignore index bb6e921035..bb6e921035 100644 --- a/tests/auto/qgl/.gitignore +++ b/tests/auto/opengl/qgl/.gitignore diff --git a/tests/auto/qgl/qgl.pro b/tests/auto/opengl/qgl/qgl.pro index c5e26451ed..c5e26451ed 100644 --- a/tests/auto/qgl/qgl.pro +++ b/tests/auto/opengl/qgl/qgl.pro diff --git a/tests/auto/opengl/qgl/qgl.qrc b/tests/auto/opengl/qgl/qgl.qrc new file mode 100644 index 0000000000..70f425c1b9 --- /dev/null +++ b/tests/auto/opengl/qgl/qgl.qrc @@ -0,0 +1,5 @@ +<!DOCTYPE RCC><RCC version="1.0"> +<qresource> + <file alias="designer.png">../../gui/image/qpixmap/images/designer.png</file> +</qresource> +</RCC> diff --git a/tests/auto/qgl/tst_qgl.cpp b/tests/auto/opengl/qgl/tst_qgl.cpp index e1c3462560..e1c3462560 100644 --- a/tests/auto/qgl/tst_qgl.cpp +++ b/tests/auto/opengl/qgl/tst_qgl.cpp diff --git a/tests/auto/qglbuffer/qglbuffer.pro b/tests/auto/opengl/qglbuffer/qglbuffer.pro index 48bd966797..48bd966797 100644 --- a/tests/auto/qglbuffer/qglbuffer.pro +++ b/tests/auto/opengl/qglbuffer/qglbuffer.pro diff --git a/tests/auto/qglbuffer/tst_qglbuffer.cpp b/tests/auto/opengl/qglbuffer/tst_qglbuffer.cpp index 9215b5fedd..9215b5fedd 100644 --- a/tests/auto/qglbuffer/tst_qglbuffer.cpp +++ b/tests/auto/opengl/qglbuffer/tst_qglbuffer.cpp diff --git a/tests/auto/qglfunctions/qglfunctions.pro b/tests/auto/opengl/qglfunctions/qglfunctions.pro index 9fe8de2b23..9fe8de2b23 100644 --- a/tests/auto/qglfunctions/qglfunctions.pro +++ b/tests/auto/opengl/qglfunctions/qglfunctions.pro diff --git a/tests/auto/qglfunctions/tst_qglfunctions.cpp b/tests/auto/opengl/qglfunctions/tst_qglfunctions.cpp index ec87f6f857..ec87f6f857 100644 --- a/tests/auto/qglfunctions/tst_qglfunctions.cpp +++ b/tests/auto/opengl/qglfunctions/tst_qglfunctions.cpp diff --git a/tests/auto/qglthreads/qglthreads.pro b/tests/auto/opengl/qglthreads/qglthreads.pro index d2fd31411f..d2fd31411f 100644 --- a/tests/auto/qglthreads/qglthreads.pro +++ b/tests/auto/opengl/qglthreads/qglthreads.pro diff --git a/tests/auto/qglthreads/tst_qglthreads.cpp b/tests/auto/opengl/qglthreads/tst_qglthreads.cpp index ee05e406c8..ee05e406c8 100644 --- a/tests/auto/qglthreads/tst_qglthreads.cpp +++ b/tests/auto/opengl/qglthreads/tst_qglthreads.cpp diff --git a/tests/auto/qglthreads/tst_qglthreads.h b/tests/auto/opengl/qglthreads/tst_qglthreads.h index 7972638085..7972638085 100644 --- a/tests/auto/qglthreads/tst_qglthreads.h +++ b/tests/auto/opengl/qglthreads/tst_qglthreads.h diff --git a/tests/auto/qgl/qgl.qrc b/tests/auto/qgl/qgl.qrc deleted file mode 100644 index 42281afc98..0000000000 --- a/tests/auto/qgl/qgl.qrc +++ /dev/null @@ -1,5 +0,0 @@ -<!DOCTYPE RCC><RCC version="1.0"> -<qresource> - <file alias="designer.png">../gui/image/qpixmap/images/designer.png</file> -</qresource> -</RCC> |