diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2010-03-30 13:03:14 (GMT) |
|---|---|---|
| committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2010-03-30 13:03:14 (GMT) |
| commit | 429b747d492ef038c2ed58a9a72060d951721252 (patch) | |
| tree | 2c96e795e4f3ea8aa7eddc6306fba903ef4019fa /tests | |
| parent | 853894dca607a0266f3c6d23c937dd5f55e551af (diff) | |
| parent | b73fa21a343e0e8f6a7c2cb1d07eaff644481c44 (diff) | |
| download | Qt-429b747d492ef038c2ed58a9a72060d951721252.zip Qt-429b747d492ef038c2ed58a9a72060d951721252.tar.gz Qt-429b747d492ef038c2ed58a9a72060d951721252.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/qgl/qgl.pro | 1 | ||||
| -rw-r--r-- | tests/auto/qglbuffer/qglbuffer.pro | 2 | ||||
| -rw-r--r-- | tests/auto/qglthreads/qglthreads.pro | 2 |
3 files changed, 5 insertions, 0 deletions
diff --git a/tests/auto/qgl/qgl.pro b/tests/auto/qgl/qgl.pro index 5f058f9..20f8018 100644 --- a/tests/auto/qgl/qgl.pro +++ b/tests/auto/qgl/qgl.pro @@ -7,6 +7,7 @@ requires(contains(QT_CONFIG,opengl)) QT += opengl contains(QT_CONFIG,egl):DEFINES += QGL_EGL +win32:!wince*: DEFINES += QT_NO_EGL SOURCES += tst_qgl.cpp RESOURCES = qgl.qrc diff --git a/tests/auto/qglbuffer/qglbuffer.pro b/tests/auto/qglbuffer/qglbuffer.pro index 07d05bb..5627d2d 100644 --- a/tests/auto/qglbuffer/qglbuffer.pro +++ b/tests/auto/qglbuffer/qglbuffer.pro @@ -6,4 +6,6 @@ load(qttest_p4) requires(contains(QT_CONFIG,opengl)) QT += opengl +win32:!wince*: DEFINES += QT_NO_EGL + SOURCES += tst_qglbuffer.cpp diff --git a/tests/auto/qglthreads/qglthreads.pro b/tests/auto/qglthreads/qglthreads.pro index 73b75d4..883eef2 100644 --- a/tests/auto/qglthreads/qglthreads.pro +++ b/tests/auto/qglthreads/qglthreads.pro @@ -2,6 +2,8 @@ load(qttest_p4) requires(contains(QT_CONFIG,opengl)) QT += opengl +win32:!wince*: DEFINES += QT_NO_EGL + HEADERS += tst_qglthreads.h SOURCES += tst_qglthreads.cpp |