diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-17 01:00:14 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-17 01:00:15 +0200 |
| commit | 73bce0411defd11ed96f4ceefe11e44288cd0ad4 (patch) | |
| tree | 51c634bcf0d84ab0daf476f7d14134c9bed82346 /src/corelib/tools | |
| parent | b26ac46c5956e716821e64f291749be110731f16 (diff) | |
| parent | 6cee284001adf9da42b347a074cbff3cb92621b2 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I4d7f0e35f4a6ccb6d5494f947fd82fc276feadd3
Diffstat (limited to 'src/corelib/tools')
| -rw-r--r-- | src/corelib/tools/qcontainertools_impl.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/corelib/tools/qcontainertools_impl.h b/src/corelib/tools/qcontainertools_impl.h index 86a16eb32b..3a0c4381f1 100644 --- a/src/corelib/tools/qcontainertools_impl.h +++ b/src/corelib/tools/qcontainertools_impl.h @@ -49,8 +49,6 @@ #include <QtCore/qglobal.h> #include <iterator> -#ifndef Q_QDOC - QT_BEGIN_NAMESPACE namespace QtPrivate @@ -131,6 +129,4 @@ using IfAssociativeIteratorHasFirstAndSecond = QT_END_NAMESPACE -#endif // Q_QDOC - #endif // QCONTAINERTOOLS_IMPL_H |