summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@digia.com>2013-11-26 10:17:44 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-12-03 08:23:38 +0100
commit4c86230bfe563ef1e3ef493b870203761bc9f32d (patch)
treec5d83871938f66f7ba07c47c0a547463a668634b
parent840e2817de1eda68f656f9764f824898ebf6d9c2 (diff)
Do not force SSE2 instructions on i386 buildsv5.2.0
To have consistent rendering between x86 and x64 builds QtWebKit enables SSE2 math on x86. This however raises the minimum requirements of the x86 binaries and should be disabled in Qt builds. Change-Id: If57ff0a3c9cd0a91a508ba02fda8b596381262a8 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
-rw-r--r--Tools/qmake/mkspecs/features/unix/default_post.prf6
1 files changed, 4 insertions, 2 deletions
diff --git a/Tools/qmake/mkspecs/features/unix/default_post.prf b/Tools/qmake/mkspecs/features/unix/default_post.prf
index a29534d3a..2df72d909 100644
--- a/Tools/qmake/mkspecs/features/unix/default_post.prf
+++ b/Tools/qmake/mkspecs/features/unix/default_post.prf
@@ -8,8 +8,10 @@
# 387 to make layout test results same on 32 and on 64 bit builds.
# See https://bugs.webkit.org/show_bug.cgi?id=52810#c39 for details.
linux-g++*:isEqual(QT_ARCH,i386) {
- QMAKE_CFLAGS += -march=pentium4 -msse2 -mfpmath=sse
- QMAKE_CXXFLAGS += -march=pentium4 -msse2 -mfpmath=sse
+ !production_build {
+ QMAKE_CFLAGS += -march=pentium4 -msse2 -mfpmath=sse
+ QMAKE_CXXFLAGS += -march=pentium4 -msse2 -mfpmath=sse
+ }
# Use the stabs format for 32 bit debug builds to make the object files a bit smaller.
QMAKE_CXXFLAGS_DEBUG -= -g