diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-05-23 12:35:03 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-05-23 12:35:19 +0200 |
| commit | c24645a511467883630e2601e76cc90fb78c24a9 (patch) | |
| tree | 862ddcb6a5cf80afa153eb078e9c3f3e7dbefbd0 | |
| parent | 607320ca9fb2796a5f6f2578578fd314f7e8b99e (diff) | |
| parent | 18e77550f149722e0554f24ddfa326e03a9fef10 (diff) | |
Merge remote-tracking branch 'origin/5.6.1' into 5.7.0
Change-Id: I5c636ff0d203747bad88c57abec176dec34deb47
| -rw-r--r-- | dist/changes-5.6.1 | 4 | ||||
| -rw-r--r-- | src/qml/qml.pro | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/dist/changes-5.6.1 b/dist/changes-5.6.1 index 5a3c9b62e6..9506987cd3 100644 --- a/dist/changes-5.6.1 +++ b/dist/changes-5.6.1 @@ -4,7 +4,7 @@ compatibility (source and binary) with Qt 5.6.0. For more details, refer to the online documentation included in this distribution. The documentation is also available online: - http://qt-project.org/doc/qt-5.6 + https://doc.qt.io/qt-5.6 The Qt version 5.6 series is binary compatible with the 5.5.x series. Applications compiled for 5.5 will continue to run with 5.6. @@ -12,7 +12,7 @@ Applications compiled for 5.5 will continue to run with 5.6. Some of the changes listed in this file include issue tracking numbers corresponding to tasks in the Qt Bug Tracker: - http://bugreports.qt-project.org/ + https://bugreports.qt.io/ Each of these identifiers can be entered in the bug tracker to obtain more information about a particular change. 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 |