diff options
| -rw-r--r-- | doc/global/qt-cpp-ignore.qdocconf | 2 | ||||
| -rw-r--r-- | src/corelib/global/qglobal.cpp | 3 | ||||
| -rw-r--r-- | src/tools/qdoc/doc/config/qt-cpp-ignore.qdocconf | 2 |
3 files changed, 1 insertions, 6 deletions
diff --git a/doc/global/qt-cpp-ignore.qdocconf b/doc/global/qt-cpp-ignore.qdocconf index 6dd1536c1f..89d24152a2 100644 --- a/doc/global/qt-cpp-ignore.qdocconf +++ b/doc/global/qt-cpp-ignore.qdocconf @@ -75,12 +75,10 @@ Cpp.ignoretokens += \ QM_EXPORT_XML \ QT_ASCII_CAST_WARN \ QT_ASCII_CAST_WARN_CONSTRUCTOR \ - QT_BEGIN_HEADER \ QT_BEGIN_INCLUDE_NAMESPACE \ QT_BEGIN_NAMESPACE \ QT_BOOTSTRAPPED \ QT_DESIGNER_STATIC \ - QT_END_HEADER \ QT_END_INCLUDE_NAMESPACE \ QT_END_NAMESPACE \ QT_FASTCALL \ diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp index 454e5d828d..8bbc44978d 100644 --- a/src/corelib/global/qglobal.cpp +++ b/src/corelib/global/qglobal.cpp @@ -2792,8 +2792,7 @@ bool QInternal::activateCallbacks(Callback cb, void **parameters) As a rule of thumb, \c QT_BEGIN_NAMESPACE should appear in all Qt header and Qt source files after the last \c{#include} line and before the first - declaration. In Qt headers using \c QT_BEGIN_HEADER, \c QT_BEGIN_NAMESPACE - follows \c QT_BEGIN_HEADER immediately. + declaration. If that rule can't be followed because, e.g., \c{#include} lines and declarations are wildly mixed, place \c QT_BEGIN_NAMESPACE before diff --git a/src/tools/qdoc/doc/config/qt-cpp-ignore.qdocconf b/src/tools/qdoc/doc/config/qt-cpp-ignore.qdocconf index 21efcf9940..38a421f829 100644 --- a/src/tools/qdoc/doc/config/qt-cpp-ignore.qdocconf +++ b/src/tools/qdoc/doc/config/qt-cpp-ignore.qdocconf @@ -19,9 +19,7 @@ Cpp.ignoretokens = QAXFACTORY_EXPORT \ QM_EXPORT_XML \ QT_ASCII_CAST_WARN \ QT_ASCII_CAST_WARN_CONSTRUCTOR \ - QT_BEGIN_HEADER \ QT_DESIGNER_STATIC \ - QT_END_HEADER \ QT_FASTCALL \ QT_WIDGET_PLUGIN_EXPORT \ Q_COMPAT_EXPORT \ |