summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJani Heikkinen <jani.heikkinen@qt.io>2016-05-24 04:35:37 +0000
committerThe Qt Project <gerrit-noreply@qt-project.org>2016-05-24 04:35:37 +0000
commit050429b01d00c69974fded4121966610f38817bb (patch)
tree5f389f529d395b0939f71296d4efa8ac62826be0
parent5e651178b2d1ac9cea70913de21e0c5b2b7aaa0d (diff)
parentc24645a511467883630e2601e76cc90fb78c24a9 (diff)
Merge "Merge remote-tracking branch 'origin/5.6.1' into 5.7.0" into refs/staging/5.7.0
-rw-r--r--dist/changes-5.6.14
-rw-r--r--src/qml/qml.pro5
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