diff options
| author | Rhys Weatherley <rhys.weatherley@nokia.com> | 2010-01-29 00:48:15 (GMT) |
|---|---|---|
| committer | Rhys Weatherley <rhys.weatherley@nokia.com> | 2010-02-04 01:06:08 (GMT) |
| commit | ad47f9cee2cd47ef566f86ca20f54e3f6da54070 (patch) | |
| tree | 2c77b9ee200da679ffabea192395ec8fc4509b43 /mkspecs/features | |
| parent | 35988b6d5d14388004a4b51df1355d3d3a97d145 (diff) | |
| download | Qt-ad47f9cee2cd47ef566f86ca20f54e3f6da54070.zip Qt-ad47f9cee2cd47ef566f86ca20f54e3f6da54070.tar.gz Qt-ad47f9cee2cd47ef566f86ca20f54e3f6da54070.tar.bz2 | |
Remove obsolete OpenGL/ES CommonLite (fixed-point) support
Task-number: QTBUG-7683
Reviewed-by: Tom Cooksey
Diffstat (limited to 'mkspecs/features')
| -rw-r--r-- | mkspecs/features/egl.prf | 8 | ||||
| -rw-r--r-- | mkspecs/features/unix/opengl.prf | 5 |
2 files changed, 0 insertions, 13 deletions
diff --git a/mkspecs/features/egl.prf b/mkspecs/features/egl.prf index 00f70d3..7e7d098 100644 --- a/mkspecs/features/egl.prf +++ b/mkspecs/features/egl.prf @@ -11,14 +11,6 @@ wince*:contains(QT_CONFIG, opengles1) { exists($$p):LIBS_PRIVATE += -L$$p } DEFINES += QT_GLES_EGL -} else:wince*:contains(QT_CONFIG, opengles1cl) { - INCLUDEPATH += $$QMAKE_INCDIR_OPENGL_ES1CL - LIBS_PRIVATE += $$QMAKE_LIBS_OPENGL_ES1CL - LIBS += $$QMAKE_LFLAGS_EGL - for(p, QMAKE_LIBDIR_OPENGL_ES1CL) { - exists($$p):LIBS_PRIVATE += -L$$p - } - DEFINES += QT_GLES_EGL } else { INCLUDEPATH += $$QMAKE_INCDIR_EGL LIBS_PRIVATE += $$QMAKE_LIBS_EGL diff --git a/mkspecs/features/unix/opengl.prf b/mkspecs/features/unix/opengl.prf index f2db819..74a5149 100644 --- a/mkspecs/features/unix/opengl.prf +++ b/mkspecs/features/unix/opengl.prf @@ -3,11 +3,6 @@ contains(QT_CONFIG, opengles1) { !isEmpty(QMAKE_LIBDIR_OPENGL_ES1):QMAKE_LIBDIR += $$QMAKE_LIBDIR_OPENGL_ES1 target_qt:LIBS_PRIVATE += $$QMAKE_LIBS_OPENGL_ES1 else:LIBS += $$QMAKE_LIBS_OPENGL_ES1 -} else:contains(QT_CONFIG, opengles1cl) { - INCLUDEPATH += $$QMAKE_INCDIR_OPENGL_ES1CL - !isEmpty(QMAKE_LIBDIR_OPENGL_ES1CL):QMAKE_LIBDIR += $$QMAKE_LIBDIR_OPENGL_ES1CL - target_qt:LIBS_PRIVATE += $$QMAKE_LIBS_OPENGL_ES1CL - else:LIBS += $$QMAKE_LIBS_OPENGL_ES1CL } else:contains(QT_CONFIG, opengles2) { INCLUDEPATH += $$QMAKE_INCDIR_OPENGL_ES2 !isEmpty(QMAKE_LIBDIR_OPENGL_ES2):QMAKE_LIBDIR += $$QMAKE_LIBDIR_OPENGL_ES2 |