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 /mkspecs | |
| 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 'mkspecs')
| -rw-r--r-- | mkspecs/features/win32/opengl.prf | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/mkspecs/features/win32/opengl.prf b/mkspecs/features/win32/opengl.prf index 30af2a3..3414781 100644 --- a/mkspecs/features/win32/opengl.prf +++ b/mkspecs/features/win32/opengl.prf @@ -1,3 +1,11 @@ -QMAKE_LIBS += $$QMAKE_LIBS_OPENGL -QMAKE_LFLAGS += $$QMAKE_LFLAGS_OPENGL +# WinCE does not have a platform directory for .prf files, and the +# win32 directory is searched for .prfs by qmake on WinCE. Ideally +# there should be a features/wince/opengl.prf which contains the wince +# block below. +wince* { + include(../unix/opengl.prf) +} else { + QMAKE_LIBS += $$QMAKE_LIBS_OPENGL + QMAKE_LFLAGS += $$QMAKE_LFLAGS_OPENGL +} |