diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-09-16 23:21:10 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-09-16 23:21:16 +0200 |
| commit | 345226aa3ecee8642c3bf46e40c981d4a49d958e (patch) | |
| tree | eb49f01c70d239286cb3f08bbe677c47c640cd12 /src/qml/qml.pro | |
| parent | 5149aa68eca6ede8836ec4f07a14d22d9da9b161 (diff) | |
| parent | a273a0ad9c1df7aed612ee6353753f668d545076 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: Ib45654e3e79087da4754377f0d78b70c44ed4695
Diffstat (limited to 'src/qml/qml.pro')
| -rw-r--r-- | src/qml/qml.pro | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/qml/qml.pro b/src/qml/qml.pro index f4862a17a6..7c9eef6df1 100644 --- a/src/qml/qml.pro +++ b/src/qml/qml.pro @@ -18,9 +18,13 @@ exists("qqml_enable_gcov") { greaterThan(QT_GCC_MAJOR_VERSION, 5) { # Our code is bad. Temporary workaround. - QMAKE_CXXFLAGS += -fno-delete-null-pointer-checks + 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 |