diff options
| author | axis <qt-info@nokia.com> | 2009-12-18 10:32:06 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2009-12-18 10:32:06 (GMT) |
| commit | 2fb8ea9aa787d59ac16250eade0adfea08f1ca9d (patch) | |
| tree | c274575bb148c9755a901094fc94d4553a84653c /mkspecs/common | |
| parent | ab8508380d6e5875ed871196eb09642380ac1aef (diff) | |
| parent | bf819a04b0c60c64912f72b613c1546d8be7dc50 (diff) | |
| download | Qt-2fb8ea9aa787d59ac16250eade0adfea08f1ca9d.zip Qt-2fb8ea9aa787d59ac16250eade0adfea08f1ca9d.tar.gz Qt-2fb8ea9aa787d59ac16250eade0adfea08f1ca9d.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public
Conflicts:
configure
src/gui/text/qfontdatabase_s60.cpp
Diffstat (limited to 'mkspecs/common')
| -rw-r--r-- | mkspecs/common/symbian/symbian.conf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/common/symbian/symbian.conf b/mkspecs/common/symbian/symbian.conf index 79bac42..0f06b92 100644 --- a/mkspecs/common/symbian/symbian.conf +++ b/mkspecs/common/symbian/symbian.conf @@ -7,7 +7,7 @@ CONFIG += qt warn_on release incremental QT += core gui QMAKE_INCREMENTAL_STYLE = sublib -DEFINES += UNICODE QT_KEYPAD_NAVIGATION QT_SOFTKEYS_ENABLED +DEFINES += UNICODE QT_KEYPAD_NAVIGATION QT_SOFTKEYS_ENABLED QT_USE_MATH_H_FLOATS QMAKE_COMPILER_DEFINES += SYMBIAN QMAKE_EXT_OBJ = .o |