path: root/src/corelib/global
diff options
authorSergio Ahumada <>2013-01-30 20:06:45 +0100
committerThe Qt Project <>2013-01-31 20:08:58 +0100
commit1e33f30f75dea6481c85b5f636f1136eb1a3da15 (patch)
tree1604ab084fbcb931f524a38014821ee1f6cb9f03 /src/corelib/global
parent3260aec38ebfdd9f5bc0ce8e5b8e239f30a59c1b (diff)
Remove left-overs of QT_{BEGIN,END}_HEADERS
This macro is useless from Qt 5.1 on, so: - Remove comment about using QT_BEGIN_NAMESPACE after QT_BEGIN_HEADER - There is no need to blacklist these in qt-cpp-ignore.qdocconf Change-Id: I2c3ceb3d77d294a606b87f7486071a2350b3d42f Reviewed-by: Laszlo Papp <> Reviewed-by: hjk <> Reviewed-by: Lars Knoll <> Reviewed-by: Jerome Pasion <>
Diffstat (limited to 'src/corelib/global')
1 files changed, 1 insertions, 2 deletions
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