summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorIain <qt-info@nokia.com>2010-02-02 12:10:01 (GMT)
committerIain <qt-info@nokia.com>2010-02-02 12:11:52 (GMT)
commit64581bfcb285a2c51e5bb0facd9dc82fb53c6875 (patch)
treeab491c30801efc5ee226e4963df9edc265b582a5 /tools
parenta8491158527e257142a4d7c5a7c86385f80a6d9e (diff)
downloadQt-64581bfcb285a2c51e5bb0facd9dc82fb53c6875.zip
Qt-64581bfcb285a2c51e5bb0facd9dc82fb53c6875.tar.gz
Qt-64581bfcb285a2c51e5bb0facd9dc82fb53c6875.tar.bz2
Revert "Update default FPU flags on Symbian to be softvfp+vfpv2"
RVCT2.2 build 686 crashes when compiling the drawhelpers with VFPv2 enabled. Until compiler workaround found, back out the change. This reverts commit 297e84fcfed524687455d3d94161bf2a32f62d37. Conflicts: configure.exe
Diffstat (limited to 'tools')
-rw-r--r--tools/configure/configureapp.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index 342e47b..8d1b640 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -1482,7 +1482,7 @@ void Configure::applySpecSpecifics()
dictionary[ "QT_HOST_PREFIX" ] = dictionary[ "QT_INSTALL_PREFIX" ];
dictionary[ "QT_INSTALL_PREFIX" ] = "";
dictionary[ "QT_INSTALL_PLUGINS" ] = "\\resource\\qt\\plugins";
- dictionary[ "ARM_FPU_TYPE" ] = "softvfp+vfpv2";
+ dictionary[ "ARM_FPU_TYPE" ] = "softvfp";
dictionary[ "SQL_SQLITE" ] = "yes";
dictionary[ "SQL_SQLITE_LIB" ] = "system";