summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVille Voutilainen <ville.voutilainen@qt.io>2017-04-12 06:19:06 (GMT)
committerVille Voutilainen <ville.voutilainen@qt.io>2017-04-12 06:49:36 (GMT)
commitbefda75eb0adc1a4b39e7f8e0c78d667160a6c41 (patch)
treed9477901cdef80b0a3fdeada6024be5181c63248
parent7c92929b7611d873df34434151fe28ae88daed4f (diff)
downloadqtxmlpatterns-befda75eb0adc1a4b39e7f8e0c78d667160a6c41.tar.gz
Fix gcc 7 build
We seem to get something that looks very much like a false positive for a maybe-uninitialized value. Disable -Wmaybe-uninitialized in the offending header file. Change-Id: If79bc7798df50f4dd0dcf63399213b4e4a7cdbd3 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
-rw-r--r--src/xmlpatterns/api/qabstractxmlnodemodel.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/xmlpatterns/api/qabstractxmlnodemodel.h b/src/xmlpatterns/api/qabstractxmlnodemodel.h
index 6b6593d..db3cd4d 100644
--- a/src/xmlpatterns/api/qabstractxmlnodemodel.h
+++ b/src/xmlpatterns/api/qabstractxmlnodemodel.h
@@ -187,6 +187,8 @@ public:
return m_storage.model;
}
+QT_WARNING_PUSH
+QT_WARNING_DISABLE_GCC("-Wmaybe-uninitialized")
inline qint64 additionalData() const
{
return m_storage.additionalData;
@@ -196,6 +198,7 @@ public:
{
return !m_storage.model;
}
+QT_WARNING_POP
/* The members below are internal, not part of the public API, and
* unsupported. Using them leads to undefined behavior. */