diff options
author | Liang Qi <liang.qi@qt.io> | 2016-09-16 08:57:59 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-09-16 08:58:07 +0200 |
commit | a273a0ad9c1df7aed612ee6353753f668d545076 (patch) | |
tree | 229f361813dd4ba268e7914e5b00a6e664ced5a4 /src/qml | |
parent | 4e6c5eade5504b335e31bd0950b9a702f8db58e7 (diff) | |
parent | c1d726fe19c83cf081042e55ace9d9d7b31c40e6 (diff) |
Merge remote-tracking branch 'origin/5.6.2' into 5.6
Change-Id: I410c2bd25a1bddc0e395316d62791437684b8942
Diffstat (limited to 'src/qml')
-rw-r--r-- | src/qml/qml.pro | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/qml/qml.pro b/src/qml/qml.pro index 651afa6b75..7c9eef6df1 100644 --- a/src/qml/qml.pro +++ b/src/qml/qml.pro @@ -21,6 +21,10 @@ greaterThan(QT_GCC_MAJOR_VERSION, 5) { QMAKE_CXXFLAGS += -fno-delete-null-pointer-checks -fno-lifetime-dse } +# QTBUG-55238, disable new optimizer for MSVC 2015/Update 3. +release:win32-msvc*:equals(QT_CL_MAJOR_VERSION, 19):equals(QT_CL_MINOR_VERSION, 00): \ + greaterThan(QT_CL_PATCH_VERSION, 24212):QMAKE_CXXFLAGS += -d2SSAOptimizer- + QMAKE_DOCS = $$PWD/doc/qtqml.qdocconf # 2415: variable "xx" of static storage duration was declared but never referenced |