diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-26 01:01:13 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-26 01:01:14 +0200 |
| commit | 86e74d60d2ab66a142a3ed02aabcadaab53b94ed (patch) | |
| tree | 11ebf7349863272acb4821ceeb99c394407c5121 /src/corelib/serialization | |
| parent | 9d504e1150e4bd49d34aba5cee938d1fd9f7e80c (diff) | |
| parent | 48603baf949f12928476f11e17fd387b8903d971 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I208a36bf1c88c8291baaa5ca8fe8e838bc9d7aea
Diffstat (limited to 'src/corelib/serialization')
| -rw-r--r-- | src/corelib/serialization/qtextstream.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/corelib/serialization/qtextstream.h b/src/corelib/serialization/qtextstream.h index 4efa84f1f1..935ec16536 100644 --- a/src/corelib/serialization/qtextstream.h +++ b/src/corelib/serialization/qtextstream.h @@ -279,9 +279,12 @@ namespace Qt { using namespace QTextStreamFunctions; } +QT_WARNING_PUSH +QT_WARNING_DISABLE_CLANG("-Wheader-hygiene") // We use 'using namespace' as that doesn't cause // conflicting definitions compiler errors. using namespace QTextStreamFunctions; +QT_WARNING_POP #endif // QT_VERSION < QT_VERSION_CHECK(6, 0, 0) && !defined(Q_QDOC) inline QTextStreamManipulator qSetFieldWidth(int width) |