diff options
author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-11-27 10:58:56 +0100 |
---|---|---|
committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-11-27 10:58:56 +0100 |
commit | 9df70b0304fa44d2f1b1504d7e58d718eab4343a (patch) | |
tree | 95a7b207a39c2b44bd4e80bcc1ea3d36bedd9a99 /.qmake.conf | |
parent | 648d4ae6a3591e916f175e32c12a2ea4f8edb6a9 (diff) | |
parent | 900e3d4ad5f2bc4994ddf164c15c641f85630b81 (diff) |
Merge branch 'stable' into dev
Conflicts:
.qmake.conf
Change-Id: I10d4f9e993d23750a6e8ddc1291b79e47fc83c64
Diffstat (limited to '.qmake.conf')
-rw-r--r-- | .qmake.conf | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/.qmake.conf b/.qmake.conf index 43c664e01f..88d13d1eef 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -3,21 +3,3 @@ CONFIG += qt_example_installs CONFIG += warning_clean MODULE_VERSION = 5.3.0 - -# For the JS engine we need to be able to produce back traces, -# and as we're using the C stack, we need the system to be able -# to walk it properly. Unfortunately on Windows with i386 there -# are no unwind tables, that can compensate for an omitted frame -# pointer, so we have no choice but to disable the frame pointer -# omission optimizations. -# Only within the qtdeclarative module we support throwing V4 -# exceptions, hence the choice of applying this change here. -win32:equals(QT_ARCH, "i386") { - *msvc*: QMAKE_CXXFLAGS += -Oy- - *g++*: QMAKE_CXXFLAGS += -fno-omit-frame-pointer -} - -# Any code within this module has access to the private V4 API and -# can therefore be subject to exception traversal. Support for exceptions -# is therefore required, especially with older toolchains. -CONFIG += exceptions |