diff options
| author | Trond Kjernåsen <trond@trolltech.com> | 2009-11-04 12:11:15 (GMT) |
|---|---|---|
| committer | Trond Kjernåsen <trond@trolltech.com> | 2009-11-04 12:11:15 (GMT) |
| commit | 5b6815ba1d6d82687b8244172482bb089210c8d2 (patch) | |
| tree | 4e124518c6ccbccf45186043f98afc786e7d5767 /src | |
| parent | 26ded29b31c71ff43036798015cb1c77aae427e3 (diff) | |
| download | Qt-5b6815ba1d6d82687b8244172482bb089210c8d2.zip Qt-5b6815ba1d6d82687b8244172482bb089210c8d2.tar.gz Qt-5b6815ba1d6d82687b8244172482bb089210c8d2.tar.bz2 | |
Fixed hardcoded GL library names on WinCE.
Task-number: QTBUG-5148
Reviewed-by: Tom Cooksey
Diffstat (limited to 'src')
| -rw-r--r-- | src/opengl/opengl.pro | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/src/opengl/opengl.pro b/src/opengl/opengl.pro index deaf3bd..b2474ed 100644 --- a/src/opengl/opengl.pro +++ b/src/opengl/opengl.pro @@ -54,7 +54,7 @@ SOURCES += qgl.cpp \ gl2paintengineex/qpaintengineex_opengl2_p.h \ gl2paintengineex/qglengineshadersource_p.h \ gl2paintengineex/qglcustomshaderstage_p.h \ - gl2paintengineex/qtriangulatingstroker_p.h + gl2paintengineex/qtriangulatingstroker_p.h SOURCES += qglshaderprogram.cpp \ qglpixmapfilter.cpp \ @@ -142,18 +142,3 @@ embedded { } INCLUDEPATH += ../3rdparty/harfbuzz/src - -contains(QT_CONFIG,opengles1) { - LIBS_PRIVATE += $$QMAKE_LIBS_OPENGL_ES1 - LIBS += $$QMAKE_LFLAGS_OPENGL_ES1 -} else:contains(QT_CONFIG,opengles1cl) { - LIBS_PRIVATE += $$QMAKE_LIBS_OPENGL_ES1CL - LIBS += $$QMAKE_LFLAGS_OPENGL_ES1CL -} else:contains(QT_CONFIG,opengles2) { - LIBS_PRIVATE += $$QMAKE_LIBS_OPENGL_ES2 - LIBS += $$QMAKE_LFLAGS_OPENGL_ES2 -} else { - LIBS_PRIVATE += $$QMAKE_LIBS_OPENGL - LIBS += $$QMAKE_LFLAGS_OPENGL -} - |