diff options
| author | David Boddie <dboddie@trolltech.com> | 2010-01-15 16:11:09 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2010-01-15 16:11:09 (GMT) |
| commit | 13240f5f0cdb08ec4dbb80482bd0d7d95cb6b530 (patch) | |
| tree | c2dadf2c74e4e5b663d57cab23e096a56b5e9039 /tools | |
| parent | 51fe84689320f9443117196fec2ee25c6353b79b (diff) | |
| parent | 7e22fb22acffe1d0f101a8ab3ef05a4ef7ad9b83 (diff) | |
| download | Qt-13240f5f0cdb08ec4dbb80482bd0d7d95cb6b530.zip Qt-13240f5f0cdb08ec4dbb80482bd0d7d95cb6b530.tar.gz Qt-13240f5f0cdb08ec4dbb80482bd0d7d95cb6b530.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/configure/configureapp.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 46f2280..919e68f 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -2770,8 +2770,9 @@ void Configure::generateCachefile() if (!dictionary["QT_LIBINFIX"].isEmpty()) configStream << "QT_LIBINFIX = " << dictionary["QT_LIBINFIX"] << endl; + configStream << "#Qt for Symbian FPU settings" << endl; if(!dictionary["ARM_FPU_TYPE"].isEmpty()) { - configStream<<"QMAKE_CXXFLAGS.ARMCC += --fpu "<< dictionary["ARM_FPU_TYPE"]; + configStream<<"MMP_RULES += \"ARMFPU "<< dictionary["ARM_FPU_TYPE"]<< "\""; } configStream.flush(); |