diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-01-19 08:02:40 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-01-19 08:02:40 (GMT) |
| commit | 530fd3831f012337d7460c4387ce82083ab3e144 (patch) | |
| tree | 5982ace32770fe05e5357b28099f3971f454b69f /tools | |
| parent | 630114a8c65e492b7b9008e056895302865ba528 (diff) | |
| parent | 3cb3c9a7922cd96744ff0e15790103dbb68b3bf9 (diff) | |
| download | Qt-530fd3831f012337d7460c4387ce82083ab3e144.zip Qt-530fd3831f012337d7460c4387ce82083ab3e144.tar.gz Qt-530fd3831f012337d7460c4387ce82083ab3e144.tar.bz2 | |
Merge branch '4.6' of ../qt into kinetic-declarativeui
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/configure/configureapp.cpp | 3 | ||||
| -rw-r--r-- | tools/qdoc3/test/macros.qdocconf | 2 |
2 files changed, 3 insertions, 2 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(); diff --git a/tools/qdoc3/test/macros.qdocconf b/tools/qdoc3/test/macros.qdocconf index dbb8ab8..22db23e 100644 --- a/tools/qdoc3/test/macros.qdocconf +++ b/tools/qdoc3/test/macros.qdocconf @@ -32,4 +32,4 @@ macro.mdash.HTML = "—" macro.beginfloatleft.HTML = "<div style=\"float: left; margin-right: 2em\">" macro.beginfloatright.HTML = "<div style=\"float: right; margin-left: 2em\">" macro.endfloat.HTML = "</div>" -macro.clearfloat.HTML = "<div style=\"clear: both\">" +macro.clearfloat.HTML = "<br style=\"clear: both\" />" |