diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-14 00:58:49 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-14 00:58:49 (GMT) |
| commit | 862d5433fb694a03715b2327a107b3192b921924 (patch) | |
| tree | f98ae879f7f6131864798524433d50e9f29232ba /tools | |
| parent | 4e5dedc7b2729152470827e50ee47d6a5bb6a500 (diff) | |
| parent | d7d67cc18a7a51703aa2cd4a8b0c64fa8cadf6a7 (diff) | |
| download | Qt-862d5433fb694a03715b2327a107b3192b921924.zip Qt-862d5433fb694a03715b2327a107b3192b921924.tar.gz Qt-862d5433fb694a03715b2327a107b3192b921924.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Use MMP keyword, not compiler flags, to update FPU option on Symbian
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(); |