diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-12-12 18:04:03 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-12-12 18:04:04 +0100 |
commit | f709870f1e4f0041696e32cfd2727a600aad8e75 (patch) | |
tree | a1aefc90ef96923d2800a376e1b983c9a368c00f | |
parent | 4f8a92b738e29f93c01d0be70c8e5e7686af94b0 (diff) | |
parent | 4c86230bfe563ef1e3ef493b870203761bc9f32d (diff) | |
download | qtwebkit-f709870f1e4f0041696e32cfd2727a600aad8e75.tar.gz |
Merge remote-tracking branch 'origin/release' into stable
Change-Id: Ia8a8683d649f27498c77f5b1932dcf1aef46bb04
-rw-r--r-- | Tools/qmake/mkspecs/features/unix/default_post.prf | 6 |
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 |