diff options
| author | Jani Heikkinen <jani.heikkinen@qt.io> | 2016-05-24 04:35:37 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-05-24 04:35:37 +0000 |
| commit | 050429b01d00c69974fded4121966610f38817bb (patch) | |
| tree | 5f389f529d395b0939f71296d4efa8ac62826be0 /src | |
| parent | 5e651178b2d1ac9cea70913de21e0c5b2b7aaa0d (diff) | |
| parent | c24645a511467883630e2601e76cc90fb78c24a9 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.6.1' into 5.7.0" into refs/staging/5.7.0
Diffstat (limited to 'src')
| -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 |