summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@digia.com>2013-12-12 18:04:35 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-12-12 19:42:08 +0100
commit40c371c0deac92e46cdc3302d00ab304bcbca505 (patch)
treed928bb148251028921ebbcc67c94fd3c699340f4
parent8d010375486b50f89951ca85c76c8db4d1b14e49 (diff)
parentf709870f1e4f0041696e32cfd2727a600aad8e75 (diff)
Merge "Merge remote-tracking branch 'origin/release' into stable" into refs/staging/stable
-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