diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-04-12 10:20:28 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-04-12 10:20:28 +0200 |
| commit | a5984f0a63233e0e9608ce8ab66e6d2d0e6948e3 (patch) | |
| tree | 0bc15fb9c75bdb98ec58cb56b9cdb96f9c0e8496 /src/xmlpatterns/api/qabstractxmlnodemodel.h | |
| parent | 141d12bd6d8c51bc92128654a084b36c6b747120 (diff) | |
| parent | 3a44e86cdceba7acc6b830274968b0dfa482f5a8 (diff) | |
| download | qtxmlpatterns-a5984f0a63233e0e9608ce8ab66e6d2d0e6948e3.tar.gz | |
Merge remote-tracking branch 'origin/5.9' into dev
Change-Id: Iea8a806a7fe03bc52ffdae10b8459ce6cc275cc6
Diffstat (limited to 'src/xmlpatterns/api/qabstractxmlnodemodel.h')
| -rw-r--r-- | src/xmlpatterns/api/qabstractxmlnodemodel.h | 3 |
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. */ |