diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-04-12 17:39:28 +0200 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-04-12 17:39:28 +0200 |
| commit | 3723f30a91eda1c1b247598913cfc02b001a02c9 (patch) | |
| tree | 234241d0d6dbbf29857c4e66d2723f77239f31ee /mkspecs/common | |
| parent | 6f736694461edc25b6e757f40ab9cad6a9207ad4 (diff) | |
| parent | 957f36cb498657f94f1b5b92f52713254ff8c051 (diff) | |
Merge remote branch 'origin/4.6' into qt-4.7-from-4.6
Conflicts:
qmake/generators/symbian/symmake.cpp
src/gui/image/qimage.cpp
src/openvg/qwindowsurface_vgegl.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 bd5768b086..1df3671859 100644 --- a/mkspecs/common/symbian/symbian.conf +++ b/mkspecs/common/symbian/symbian.conf @@ -26,7 +26,7 @@ QMAKE_CFLAGS_RELEASE = QMAKE_CFLAGS_DEBUG = QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses - +MMP_OPTION_KEYWORDS = CW ARMCC GCCE VERSION_FLAGS.ARMCC = ARMCC_4_0 QMAKE_CXXFLAGS = $$QMAKE_CFLAGS # Symbian build system applies -cwd source on the MWCC command line. |