From 3e6a6ec2b095aa361499576517fdc291a7b8042d Mon Sep 17 00:00:00 2001
From: Rohan McGovern <rohan.mcgovern@nokia.com>
Date: Fri, 19 Feb 2010 08:43:45 +1000
Subject: Fixed compile of autotests.

Rename tst_openglthreading.pro to qgl_threads.pro:
.pro file name must match directory name for SUBDIRS project to work.
---
 tests/auto/auto.pro                            |  4 +---
 tests/auto/qgl_threads/qgl_threads.pro         | 11 +++++++++++
 tests/auto/qgl_threads/tst_openglthreading.pro | 11 -----------
 3 files changed, 12 insertions(+), 14 deletions(-)
 create mode 100644 tests/auto/qgl_threads/qgl_threads.pro
 delete mode 100644 tests/auto/qgl_threads/tst_openglthreading.pro

diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index 8bfd151..a02e8da 100644
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -153,8 +153,6 @@ SUBDIRS += \
            qfontmetrics \
            qftp \
            qgetputenv \
-           qgl \
-	   qgl_threads \
            qglobal \
            qgraphicseffect \
            qgraphicseffectsource \
@@ -464,7 +462,7 @@ SUBDIRS += \
            rcc \
            windowsmobile
 
-contains(QT_CONFIG,opengl):SUBDIRS += qgl qglbuffer
+contains(QT_CONFIG,opengl):SUBDIRS += qgl qglbuffer qgl_threads
 
 contains(QT_CONFIG,qt3support):!wince*:SUBDIRS += $$Q3SUBDIRS
 
diff --git a/tests/auto/qgl_threads/qgl_threads.pro b/tests/auto/qgl_threads/qgl_threads.pro
new file mode 100644
index 0000000..9312c05
--- /dev/null
+++ b/tests/auto/qgl_threads/qgl_threads.pro
@@ -0,0 +1,11 @@
+############################################################
+# Project file for autotest for file qgl.h
+############################################################
+
+load(qttest_p4)
+requires(contains(QT_CONFIG,opengl))
+QT += opengl
+
+HEADERS += tst_openglthreading.h
+SOURCES += tst_openglthreading.cpp
+
diff --git a/tests/auto/qgl_threads/tst_openglthreading.pro b/tests/auto/qgl_threads/tst_openglthreading.pro
deleted file mode 100644
index 9312c05..0000000
--- a/tests/auto/qgl_threads/tst_openglthreading.pro
+++ /dev/null
@@ -1,11 +0,0 @@
-############################################################
-# Project file for autotest for file qgl.h
-############################################################
-
-load(qttest_p4)
-requires(contains(QT_CONFIG,opengl))
-QT += opengl
-
-HEADERS += tst_openglthreading.h
-SOURCES += tst_openglthreading.cpp
-
-- 
cgit v0.12