diff options
author | Liang Qi <liang.qi@qt.io> | 2016-05-31 08:01:21 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-05-31 08:01:28 +0200 |
commit | f18841643926e01fd3fdb1c13f4b3060699cd618 (patch) | |
tree | b68eb9eb4423e85801417d07805536cd8d370223 /src/qml | |
parent | 72ee8417fa2d7789e8ccd09a54db8af9b0f1c366 (diff) | |
parent | 18e77550f149722e0554f24ddfa326e03a9fef10 (diff) |
Merge remote-tracking branch 'origin/5.6.1' into 5.6
Change-Id: I7d9e0c90645d856e501ff70d97d55ffd615a2e31
Diffstat (limited to 'src/qml')
-rw-r--r-- | src/qml/qml.pro | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/qml/qml.pro b/src/qml/qml.pro index e30c39c8b9..f4862a17a6 100644 --- a/src/qml/qml.pro +++ b/src/qml/qml.pro @@ -16,6 +16,11 @@ exists("qqml_enable_gcov") { LIBS_PRIVATE += -lgcov } +greaterThan(QT_GCC_MAJOR_VERSION, 5) { + # Our code is bad. Temporary workaround. + QMAKE_CXXFLAGS += -fno-delete-null-pointer-checks +} + QMAKE_DOCS = $$PWD/doc/qtqml.qdocconf # 2415: variable "xx" of static storage duration was declared but never referenced |