summaryrefslogtreecommitdiffstats
path: root/mkspecs/common
diff options
context:
space:
mode:
authorRhys Weatherley <rhys.weatherley@nokia.com>2010-01-29 00:48:15 (GMT)
committerRhys Weatherley <rhys.weatherley@nokia.com>2010-02-04 01:06:08 (GMT)
commitad47f9cee2cd47ef566f86ca20f54e3f6da54070 (patch)
tree2c77b9ee200da679ffabea192395ec8fc4509b43 /mkspecs/common
parent35988b6d5d14388004a4b51df1355d3d3a97d145 (diff)
downloadQt-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/common')
-rw-r--r--mkspecs/common/linux.conf3
-rw-r--r--mkspecs/common/wince/qmake.conf1
2 files changed, 0 insertions, 4 deletions
diff --git a/mkspecs/common/linux.conf b/mkspecs/common/linux.conf
index 1ae5608..4fbe2dc 100644
--- a/mkspecs/common/linux.conf
+++ b/mkspecs/common/linux.conf
@@ -15,8 +15,6 @@ QMAKE_INCDIR_OPENGL = /usr/X11R6/include
QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib
QMAKE_INCDIR_OPENGL_ES1 = $$QMAKE_INCDIR_OPENGL
QMAKE_LIBDIR_OPENGL_ES1 = $$QMAKE_LIBDIR_OPENGL
-QMAKE_INCDIR_OPENGL_ES1CL = $$QMAKE_INCDIR_OPENGL
-QMAKE_LIBDIR_OPENGL_ES1CL = $$QMAKE_LIBDIR_OPENGL
QMAKE_INCDIR_OPENGL_ES2 = $$QMAKE_INCDIR_OPENGL
QMAKE_LIBDIR_OPENGL_ES2 = $$QMAKE_LIBDIR_OPENGL
QMAKE_INCDIR_EGL =
@@ -33,7 +31,6 @@ QMAKE_LIBS_EGL = -lEGL
QMAKE_LIBS_OPENGL = -lGLU -lGL
QMAKE_LIBS_OPENGL_QT = -lGL
QMAKE_LIBS_OPENGL_ES1 = -lGLES_CM
-QMAKE_LIBS_OPENGL_ES1CL = -lGLES_CL
QMAKE_LIBS_OPENGL_ES2 = -lGLESv2
QMAKE_LIBS_OPENVG = -lOpenVG
QMAKE_LIBS_THREAD = -lpthread
diff --git a/mkspecs/common/wince/qmake.conf b/mkspecs/common/wince/qmake.conf
index ff99f1b..705cdc3 100644
--- a/mkspecs/common/wince/qmake.conf
+++ b/mkspecs/common/wince/qmake.conf
@@ -66,7 +66,6 @@ QMAKE_LIBS_COMPAT =
QMAKE_LIBS_EGL = libEGL.lib
QMAKE_LIBS_OPENGL_ES1 = libGLES_CM.lib
-QMAKE_LIBS_OPENGL_ES1CL = libGLES_CL.lib
QMAKE_LIBS_OPENGL_ES2 = libGLESv2.lib
QMAKE_LIBS_QT_ENTRY = -lqtmain