diff options
| author | Tom Cooksey <thomas.cooksey@nokia.com> | 2009-04-01 09:39:09 (GMT) |
|---|---|---|
| committer | Tom Cooksey <thomas.cooksey@nokia.com> | 2009-04-03 11:40:46 (GMT) |
| commit | ed9fe24ecce5a21f93c88c08d2034bf175808fa3 (patch) | |
| tree | 1b21ea88255f4c2624cff1928e599c47fe6a33fb | |
| parent | b652130dc00dfab7322751275e42f59943c7e8e3 (diff) | |
| download | Qt-ed9fe24ecce5a21f93c88c08d2034bf175808fa3.zip Qt-ed9fe24ecce5a21f93c88c08d2034bf175808fa3.tar.gz Qt-ed9fe24ecce5a21f93c88c08d2034bf175808fa3.tar.bz2 | |
Use QMAKE_LIBS_OPENGL_QT in the GL ES config tests
The OpenGL ES config tests are there to test if there's enough to build
QtOpenGL, not OpenGL applications using Qt. Therefore we should use
QMAKE_LIBS_OPENGL_QT rather than QMAKE_LIBS_OPENGL. This is mostely
because Qt needs to link against EGL whereas Qt applications do not.
Reviewed-by: TrustMe
| -rw-r--r-- | config.tests/unix/opengles1/opengles1.pro | 2 | ||||
| -rw-r--r-- | config.tests/unix/opengles1cl/opengles1cl.pro | 2 | ||||
| -rw-r--r-- | config.tests/unix/opengles2/opengles2.pro | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/config.tests/unix/opengles1/opengles1.pro b/config.tests/unix/opengles1/opengles1.pro index d800a5d..ad8dd31 100644 --- a/config.tests/unix/opengles1/opengles1.pro +++ b/config.tests/unix/opengles1/opengles1.pro @@ -6,4 +6,4 @@ for(p, QMAKE_LIBDIR_OPENGL) { } CONFIG -= qt -LIBS += $$QMAKE_LIBS_OPENGL +LIBS += $$QMAKE_LIBS_OPENGL_QT diff --git a/config.tests/unix/opengles1cl/opengles1cl.pro b/config.tests/unix/opengles1cl/opengles1cl.pro index c9addf9..415cdbb 100644 --- a/config.tests/unix/opengles1cl/opengles1cl.pro +++ b/config.tests/unix/opengles1cl/opengles1cl.pro @@ -6,4 +6,4 @@ for(p, QMAKE_LIBDIR_OPENGL) { } CONFIG -= qt -LIBS += $$QMAKE_LIBS_OPENGL +LIBS += $$QMAKE_LIBS_OPENGL_QT diff --git a/config.tests/unix/opengles2/opengles2.pro b/config.tests/unix/opengles2/opengles2.pro index 13f95a1..0dfae42 100644 --- a/config.tests/unix/opengles2/opengles2.pro +++ b/config.tests/unix/opengles2/opengles2.pro @@ -6,4 +6,4 @@ for(p, QMAKE_LIBDIR_OPENGL) { } CONFIG -= qt -LIBS += $$QMAKE_LIBS_OPENGL +LIBS += $$QMAKE_LIBS_OPENGL_QT |