summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2016-05-19 15:56:10 -0700
committerThiago Macieira <thiago.macieira@intel.com>2016-05-20 20:56:32 +0000
commit18e77550f149722e0554f24ddfa326e03a9fef10 (patch)
treeeddaf9d4f2771ad7880d08cf35c44e901eea585b
parent1e44d36ef7f43b6740c23530ae511a98f2a59105 (diff)
Workaround for crashes in QtQml code relating to null this pointersv5.6.1
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 <lars.knoll@theqtcompany.com>
-rw-r--r--src/qml/qml.pro5
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