diff options
| author | Tom Cooksey <thomas.cooksey@nokia.com> | 2010-03-30 11:47:13 (GMT) |
|---|---|---|
| committer | Tom Cooksey <thomas.cooksey@nokia.com> | 2010-03-30 11:47:13 (GMT) |
| commit | fb9493870fa3212b0f7a917aa92a0a30d77f3b1e (patch) | |
| tree | cfb3de2a8fc174364c14a68926084e2250bf095b | |
| parent | 568475d98d77c3ade027eb88e571ca8b84088002 (diff) | |
| download | Qt-fb9493870fa3212b0f7a917aa92a0a30d77f3b1e.zip Qt-fb9493870fa3212b0f7a917aa92a0a30d77f3b1e.tar.gz Qt-fb9493870fa3212b0f7a917aa92a0a30d77f3b1e.tar.bz2 | |
Hack .pro files on windows to define QT_NO_EGL
Temporary fix until configure.exe can be re-compiled.
Reviewed-By: TrustMe
| -rw-r--r-- | src/gui/gui.pro | 1 | ||||
| -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 |
4 files changed, 6 insertions, 0 deletions
diff --git a/src/gui/gui.pro b/src/gui/gui.pro index cbdbb5c..b22f732 100644 --- a/src/gui/gui.pro +++ b/src/gui/gui.pro @@ -41,6 +41,7 @@ include(math3d/math3d.pri) include(effects/effects.pri) contains(QT_CONFIG, egl): include(egl/egl.pri) +win32:!wince*: DEFINES += QT_NO_EGL embedded: QT += network 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 |