From 1e44d36ef7f43b6740c23530ae511a98f2a59105 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Wed, 18 May 2016 14:24:10 +0200 Subject: Fix links in changelog Use https and qt.io links. Change-Id: I089098317e38b52484a23bdfad128ef47eec8a21 Reviewed-by: Robin Burchell --- dist/changes-5.6.1 | 4 ++-- 1 file changed, 2 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. -- cgit v1.2.3 From 18e77550f149722e0554f24ddfa326e03a9fef10 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Thu, 19 May 2016 15:56:10 -0700 Subject: Workaround for crashes in QtQml code relating to null this pointers When compiled in release mode with GCC 6, QtQml crashes. This option gets works around the issue by instructing the compiler not to delete null pointer checks for pointers that the standard says cannot be null, yet apparently are. This is a temporary workaround until a proper solution is found. Change-Id: Id3aab65533904562a6cbfffd14501a185fc91179 Reviewed-by: Lars Knoll --- src/qml/qml.pro | 5 +++++ 1 file changed, 5 insertions(+) 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 -- cgit v1.2.3