diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-01 17:23:33 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-01 17:23:33 (GMT) |
| commit | b7539e72a2523cc46f41e5e04df689bc3b38f92e (patch) | |
| tree | 6ce9bf1439eb6b2d679356cb3b5cabac41f14988 /mkspecs | |
| parent | b6e2d52f08727d370ee6403ef9099165b56b39c9 (diff) | |
| parent | 64e640716204af69056c34ddac5ce26628a1edd2 (diff) | |
| download | Qt-b7539e72a2523cc46f41e5e04df689bc3b38f92e.zip Qt-b7539e72a2523cc46f41e5e04df689bc3b38f92e.tar.gz Qt-b7539e72a2523cc46f41e5e04df689bc3b38f92e.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Add the auto detection for OpenGL in configure for makefile build system on Symbian.
Don't display softkeys/statusbar on FS childs of non-FS windows
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/common/symbian/symbian-makefile.conf | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/mkspecs/common/symbian/symbian-makefile.conf b/mkspecs/common/symbian/symbian-makefile.conf index b248117..a725df3 100644 --- a/mkspecs/common/symbian/symbian-makefile.conf +++ b/mkspecs/common/symbian/symbian-makefile.conf @@ -10,6 +10,17 @@ contains(QMAKE_HOST.os,Windows) { include(symbian.conf) +QMAKE_INCDIR_OPENGL = $${EPOCROOT}epoc32/include +QMAKE_LIBDIR_OPENGL = $${EPOCROOT}epoc32/release/armv5/lib +QMAKE_INCDIR_OPENGL_ES1 = $${EPOCROOT}epoc32/include/GLES +QMAKE_LIBDIR_OPENGL_ES1 = $$QMAKE_LIBDIR_OPENGL +QMAKE_INCDIR_OPENGL_ES2 = $${EPOCROOT}epoc32/include/GLES2 +QMAKE_LIBDIR_OPENGL_ES2 = $$QMAKE_LIBDIR_OPENGL +QMAKE_INCDIR_EGL = $${EPOCROOT}epoc32/include/EGL +QMAKE_LIBDIR_EGL = $$QMAKE_LIBDIR_OPENGL +QMAKE_INCDIR_OPENVG = $${EPOCROOT}epoc32/include/VG +QMAKE_LIBDIR_OPENVG = $$QMAKE_LIBDIR_OPENGL + QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS] QMAKE_RUN_CC = $(CC) -c $(CFLAGS) $(INCPATH) -o $obj $src |