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:27 +0200 |
| commit | dd0cd711708f65c429f807f42456bff14404f9c0 (patch) | |
| tree | 14687b4d9bb0b0d2a3b0b8ad6143fa2585a7597f /src/corelib/serialization/qtextstream.h | |
| parent | ed48391c592e8ba68c723e3017ac384f0c7a7c23 (diff) | |
| parent | 86e74d60d2ab66a142a3ed02aabcadaab53b94ed (diff) | |
Merge "Merge remote-tracking branch 'origin/5.14' into 5.15"
Diffstat (limited to 'src/corelib/serialization/qtextstream.h')
| -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) |