diff options
author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-01-08 10:53:28 (GMT) |
---|---|---|
committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-01-08 10:53:28 (GMT) |
commit | 2e62227f950aac8205f2b67e4d7d046836b2c799 (patch) | |
tree | 87e91115d86896949f69e8c8d993ba795422ef3b /configure | |
parent | 9b0502aa6abf6bb9c07f205bccdf2d9c65027bde (diff) | |
parent | 118e7a807d0764dee97612589fe5d7072d271e1e (diff) | |
download | Qt-2e62227f950aac8205f2b67e4d7d046836b2c799.zip Qt-2e62227f950aac8205f2b67e4d7d046836b2c799.tar.gz Qt-2e62227f950aac8205f2b67e4d7d046836b2c799.tar.bz2 |
Merge branch '4.6'
Conflicts:
src/corelib/io/qfsfileengine.cpp
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
src/opengl/opengl.pro
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -5111,7 +5111,7 @@ if [ "$PLATFORM_X11" = "yes" ]; then if [ $? != "0" ]; then echo "The OpenGL ES 1.x Common Lite Profile functionality test failed!" echo " You might need to modify the include and library search paths by editing" - echo " QMAKE_INCDIR_OPENGL, QMAKE_LIBDIR_OPENGL and QMAKE_LIBS_OPENGL in" + echo " QMAKE_INCDIR_OPENGL_ES1CL, QMAKE_LIBDIR_OPENGL_ES1CL and QMAKE_LIBS_OPENGL_ES1CL in" echo " ${XQMAKESPEC}." exit 1 fi @@ -5121,7 +5121,7 @@ if [ "$PLATFORM_X11" = "yes" ]; then if [ $? != "0" ]; then echo "The OpenGL ES 1.x functionality test failed!" echo " You might need to modify the include and library search paths by editing" - echo " QMAKE_INCDIR_OPENGL, QMAKE_LIBDIR_OPENGL and QMAKE_LIBS_OPENGL in" + echo " QMAKE_INCDIR_OPENGL_ES1, QMAKE_LIBDIR_OPENGL_ES1 and QMAKE_LIBS_OPENGL_ES1 in" echo " ${XQMAKESPEC}." exit 1 fi @@ -5131,7 +5131,7 @@ if [ "$PLATFORM_X11" = "yes" ]; then if [ $? != "0" ]; then echo "The OpenGL ES 2.0 functionality test failed!" echo " You might need to modify the include and library search paths by editing" - echo " QMAKE_INCDIR_OPENGL, QMAKE_LIBDIR_OPENGL and QMAKE_LIBS_OPENGL in" + echo " QMAKE_INCDIR_OPENGL_ES2, QMAKE_LIBDIR_OPENGL_ES2 and QMAKE_LIBS_OPENGL_ES2 in" echo " ${XQMAKESPEC}." exit 1 fi |