diff options
| author | Iain <qt-info@nokia.com> | 2010-01-13 14:15:48 (GMT) |
|---|---|---|
| committer | Iain <qt-info@nokia.com> | 2010-01-13 14:15:48 (GMT) |
| commit | f247315cece2929d471eebfbd7e40bfb4eca831b (patch) | |
| tree | 1bcdbd9fd1148a583454d5b74100cae63ea18be2 | |
| parent | 1b62c32319feb673a65ea9f2d3e6e7056ffa9787 (diff) | |
| download | Qt-f247315cece2929d471eebfbd7e40bfb4eca831b.zip Qt-f247315cece2929d471eebfbd7e40bfb4eca831b.tar.gz Qt-f247315cece2929d471eebfbd7e40bfb4eca831b.tar.bz2 | |
Use MMP keyword, not compiler flags, to update FPU option on Symbian
This avoids two sets of --fpu flags being passed on the compiler command
line, so we don't have to worry about which takes precedence (especially
since it varies between RVCT and GCC).
Putting ARMFPU in the MMP file means that the toolchain will replace its
default option with the one we specify instead.
Reviewed-by: Aleksandar Sasha Babic
| -rw-r--r-- | configure.exe | bin | 1176576 -> 1176064 bytes | |||
| -rw-r--r-- | tools/configure/configureapp.cpp | 3 |
2 files changed, 2 insertions, 1 deletions
diff --git a/configure.exe b/configure.exe Binary files differindex a410efc..d88da13 100644 --- a/configure.exe +++ b/configure.exe diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 0ddb1df..78f65a6 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(); |