diff options
| author | axis <qt-info@nokia.com> | 2009-11-05 11:32:55 +0100 |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2009-11-05 11:32:55 +0100 |
| commit | dd6a230f812b957137a2711c772284ee77ffccf4 (patch) | |
| tree | a1f46718a295964ddaa9ab04c8222f6db3b19057 /mkspecs/features/win32/opengl.prf | |
| parent | f1a56f4db2f6d6c395ac6e7023b6e9184140d571 (diff) | |
| parent | eb75d1d6acf121fc08a591b4d6b34f1f39283bc2 (diff) | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6-s60
Diffstat (limited to 'mkspecs/features/win32/opengl.prf')
| -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 30af2a3b9e..3414781c39 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 +} |