diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2011-10-25 14:42:16 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-25 08:42:23 +0200 |
| commit | d04bf8f4073aa50b23ae154250932b5ddd3ddc0a (patch) | |
| tree | 7a44d578fe0aa03facee96d75eaccbcedfc298fd /tests/auto/opengl | |
| parent | 6b29e881cdd93d8fccec50df9e8d001776800136 (diff) | |
all remaining tests: eliminated usage of qttest_p4.prf
qttest_p4.prf was added as a convenience for Qt's own autotests in Qt4.
It enables various crufty undocumented magic, of dubious value.
Stop using it, and explicitly enable the things from it which we want.
Change-Id: I02fe27b2c1800f929250fa8694ca2976c9661a12
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Diffstat (limited to 'tests/auto/opengl')
| -rw-r--r-- | tests/auto/opengl/qgl/qgl.pro | 5 | ||||
| -rw-r--r-- | tests/auto/opengl/qglbuffer/qglbuffer.pro | 5 | ||||
| -rw-r--r-- | tests/auto/opengl/qglfunctions/qglfunctions.pro | 5 | ||||
| -rw-r--r-- | tests/auto/opengl/qglthreads/qglthreads.pro | 5 |
4 files changed, 12 insertions, 8 deletions
diff --git a/tests/auto/opengl/qgl/qgl.pro b/tests/auto/opengl/qgl/qgl.pro index c5e26451ed..963b2d7e55 100644 --- a/tests/auto/opengl/qgl/qgl.pro +++ b/tests/auto/opengl/qgl/qgl.pro @@ -2,9 +2,10 @@ # Project file for autotest for file qgl.h ############################################################ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qgl requires(contains(QT_CONFIG,opengl)) -QT += widgets widgets-private opengl-private gui-private core-private +QT += widgets widgets-private opengl-private gui-private core-private testlib contains(QT_CONFIG,egl):DEFINES += QGL_EGL win32:!wince*: DEFINES += QT_NO_EGL diff --git a/tests/auto/opengl/qglbuffer/qglbuffer.pro b/tests/auto/opengl/qglbuffer/qglbuffer.pro index 48bd966797..537f3c122a 100644 --- a/tests/auto/opengl/qglbuffer/qglbuffer.pro +++ b/tests/auto/opengl/qglbuffer/qglbuffer.pro @@ -2,9 +2,10 @@ # Project file for autotest for file qglbuffer.h ############################################################ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qglbuffer requires(contains(QT_CONFIG,opengl)) -QT += opengl widgets +QT += opengl widgets testlib win32:!wince*: DEFINES += QT_NO_EGL diff --git a/tests/auto/opengl/qglfunctions/qglfunctions.pro b/tests/auto/opengl/qglfunctions/qglfunctions.pro index 9fe8de2b23..4b7c8758a9 100644 --- a/tests/auto/opengl/qglfunctions/qglfunctions.pro +++ b/tests/auto/opengl/qglfunctions/qglfunctions.pro @@ -1,6 +1,7 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qglfunctions requires(contains(QT_CONFIG,opengl)) -QT += opengl widgets +QT += opengl widgets testlib win32:!wince*: DEFINES += QT_NO_EGL diff --git a/tests/auto/opengl/qglthreads/qglthreads.pro b/tests/auto/opengl/qglthreads/qglthreads.pro index d2fd31411f..7adde09e93 100644 --- a/tests/auto/opengl/qglthreads/qglthreads.pro +++ b/tests/auto/opengl/qglthreads/qglthreads.pro @@ -1,6 +1,7 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qglthreads requires(contains(QT_CONFIG,opengl)) -QT += opengl widgets +QT += opengl widgets testlib win32:!wince*: DEFINES += QT_NO_EGL |