From 0bfa24106d1465dccabcf7ad38c9cffdc2229f29 Mon Sep 17 00:00:00 2001 From: Jo Asplin Date: Thu, 8 Sep 2011 15:12:01 +0200 Subject: [PATCH] Moved autotests in category 'opengl' into new directory structure Task-number: QTBUG-21356 Change-Id: I496680aa670af3409e50e1c254ef2c557b414d33 Reviewed-on: http://codereview.qt-project.org/4452 Reviewed-by: Qt Sanity Bot Reviewed-by: Rohan McGovern --- tests/auto/auto.pro | 2 +- tests/auto/{ => opengl}/opengl.pro | 0 tests/auto/{ => opengl}/qgl/.gitignore | 0 tests/auto/{ => opengl}/qgl/qgl.pro | 0 tests/auto/opengl/qgl/qgl.qrc | 5 +++++ tests/auto/{ => opengl}/qgl/tst_qgl.cpp | 0 tests/auto/{ => opengl}/qglbuffer/qglbuffer.pro | 0 tests/auto/{ => opengl}/qglbuffer/tst_qglbuffer.cpp | 0 tests/auto/{ => opengl}/qglfunctions/qglfunctions.pro | 0 tests/auto/{ => opengl}/qglfunctions/tst_qglfunctions.cpp | 0 tests/auto/{ => opengl}/qglthreads/qglthreads.pro | 0 tests/auto/{ => opengl}/qglthreads/tst_qglthreads.cpp | 0 tests/auto/{ => opengl}/qglthreads/tst_qglthreads.h | 0 tests/auto/qgl/qgl.qrc | 5 ----- 14 files changed, 6 insertions(+), 6 deletions(-) rename tests/auto/{ => opengl}/opengl.pro (100%) rename tests/auto/{ => opengl}/qgl/.gitignore (100%) rename tests/auto/{ => opengl}/qgl/qgl.pro (100%) create mode 100644 tests/auto/opengl/qgl/qgl.qrc rename tests/auto/{ => opengl}/qgl/tst_qgl.cpp (100%) rename tests/auto/{ => opengl}/qglbuffer/qglbuffer.pro (100%) rename tests/auto/{ => opengl}/qglbuffer/tst_qglbuffer.cpp (100%) rename tests/auto/{ => opengl}/qglfunctions/qglfunctions.pro (100%) rename tests/auto/{ => opengl}/qglfunctions/tst_qglfunctions.cpp (100%) rename tests/auto/{ => opengl}/qglthreads/qglthreads.pro (100%) rename tests/auto/{ => opengl}/qglthreads/tst_qglthreads.cpp (100%) rename tests/auto/{ => opengl}/qglthreads/tst_qglthreads.h (100%) delete mode 100644 tests/auto/qgl/qgl.qrc diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index c2f5883..c16f00f 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 similarity index 100% rename from tests/auto/opengl.pro rename to tests/auto/opengl/opengl.pro diff --git a/tests/auto/qgl/.gitignore b/tests/auto/opengl/qgl/.gitignore similarity index 100% rename from tests/auto/qgl/.gitignore rename to tests/auto/opengl/qgl/.gitignore diff --git a/tests/auto/qgl/qgl.pro b/tests/auto/opengl/qgl/qgl.pro similarity index 100% rename from tests/auto/qgl/qgl.pro rename to 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 0000000..70f425c --- /dev/null +++ b/tests/auto/opengl/qgl/qgl.qrc @@ -0,0 +1,5 @@ + + + ../../gui/image/qpixmap/images/designer.png + + diff --git a/tests/auto/qgl/tst_qgl.cpp b/tests/auto/opengl/qgl/tst_qgl.cpp similarity index 100% rename from tests/auto/qgl/tst_qgl.cpp rename to tests/auto/opengl/qgl/tst_qgl.cpp diff --git a/tests/auto/qglbuffer/qglbuffer.pro b/tests/auto/opengl/qglbuffer/qglbuffer.pro similarity index 100% rename from tests/auto/qglbuffer/qglbuffer.pro rename to tests/auto/opengl/qglbuffer/qglbuffer.pro diff --git a/tests/auto/qglbuffer/tst_qglbuffer.cpp b/tests/auto/opengl/qglbuffer/tst_qglbuffer.cpp similarity index 100% rename from tests/auto/qglbuffer/tst_qglbuffer.cpp rename to tests/auto/opengl/qglbuffer/tst_qglbuffer.cpp diff --git a/tests/auto/qglfunctions/qglfunctions.pro b/tests/auto/opengl/qglfunctions/qglfunctions.pro similarity index 100% rename from tests/auto/qglfunctions/qglfunctions.pro rename to tests/auto/opengl/qglfunctions/qglfunctions.pro diff --git a/tests/auto/qglfunctions/tst_qglfunctions.cpp b/tests/auto/opengl/qglfunctions/tst_qglfunctions.cpp similarity index 100% rename from tests/auto/qglfunctions/tst_qglfunctions.cpp rename to tests/auto/opengl/qglfunctions/tst_qglfunctions.cpp diff --git a/tests/auto/qglthreads/qglthreads.pro b/tests/auto/opengl/qglthreads/qglthreads.pro similarity index 100% rename from tests/auto/qglthreads/qglthreads.pro rename to tests/auto/opengl/qglthreads/qglthreads.pro diff --git a/tests/auto/qglthreads/tst_qglthreads.cpp b/tests/auto/opengl/qglthreads/tst_qglthreads.cpp similarity index 100% rename from tests/auto/qglthreads/tst_qglthreads.cpp rename to tests/auto/opengl/qglthreads/tst_qglthreads.cpp diff --git a/tests/auto/qglthreads/tst_qglthreads.h b/tests/auto/opengl/qglthreads/tst_qglthreads.h similarity index 100% rename from tests/auto/qglthreads/tst_qglthreads.h rename to 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 42281af..0000000 --- a/tests/auto/qgl/qgl.qrc +++ /dev/null @@ -1,5 +0,0 @@ - - - ../gui/image/qpixmap/images/designer.png - - -- 2.7.4