diff options
| author | Jani Hautakangas <jani.hautakangas@nokia.com> | 2011-07-05 00:11:09 +0300 |
|---|---|---|
| committer | Jani Hautakangas <jani.hautakangas@nokia.com> | 2011-07-05 00:11:09 +0300 |
| commit | c018f01b8a97e9ae3dee12777fd1bde4c51f231e (patch) | |
| tree | 622fe32e3fde6cfa1e356a1349511749fb0870fc /mkspecs/common | |
| parent | 73d7fdf686c05adaf0ea8ecddfb264b7741a2e6a (diff) | |
| parent | 0a5d51aaf95524d6c5933404f0e5ab9b331d4084 (diff) | |
| download | qt4-tools-c018f01b8a97e9ae3dee12777fd1bde4c51f231e.tar.gz | |
Merge remote branch 'origin/4.7' into qt-4.8-from-4.7
Conflicts:
doc/src/external-resources.qdoc
src/gui/text/qtextlayout.cpp
src/opengl/qwindowsurface_gl.cpp
Diffstat (limited to 'mkspecs/common')
| -rw-r--r-- | mkspecs/common/symbian/symbian.conf | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mkspecs/common/symbian/symbian.conf b/mkspecs/common/symbian/symbian.conf index 5bf8728baa..4025c54bf6 100644 --- a/mkspecs/common/symbian/symbian.conf +++ b/mkspecs/common/symbian/symbian.conf @@ -88,6 +88,9 @@ QMAKE_LIBS_S60 = -lavkon -leikcoctl -lgfxtrans exists($${EPOCROOT}epoc32/include/platform/sgresource/sgimage.h) { QMAKE_LIBS_OPENVG += -lsgresource + QMAKE_LIBS_OPENGL_QT += -lsgresource + QMAKE_LIBS_OPENGL_ES1_QT += -lsgresource + QMAKE_LIBS_OPENGL_ES2_QT += -lsgresource } contains(QMAKE_HOST.os,Windows) { |