summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Boddie <dboddie@trolltech.com>2009-07-13 11:46:46 (GMT)
committerDavid Boddie <dboddie@trolltech.com>2009-07-13 11:46:46 (GMT)
commit85fbffa12bcd38b08030561335305c3226312bc6 (patch)
tree5dd4a0e42e8b9cf2f96e05c30a9ead27f5506f6a
parent109bc35a0200bb04fbbb9e7e944572082f966e91 (diff)
downloadQt-85fbffa12bcd38b08030561335305c3226312bc6.zip
Qt-85fbffa12bcd38b08030561335305c3226312bc6.tar.gz
Qt-85fbffa12bcd38b08030561335305c3226312bc6.tar.bz2
Doc: Explicitly declare the module for each namespace to prevent strange
omissions when qdoc is used in certain Windows environments. Task-number: 256415 Reviewed-by: Trust Me
-rw-r--r--doc/src/qnamespace.qdoc1
-rw-r--r--doc/src/qsql.qdoc2
-rw-r--r--src/corelib/concurrent/qtconcurrentmap.cpp1
-rw-r--r--src/opengl/qgl.cpp1
4 files changed, 4 insertions, 1 deletions
diff --git a/doc/src/qnamespace.qdoc b/doc/src/qnamespace.qdoc
index b691ac7..d509912 100644
--- a/doc/src/qnamespace.qdoc
+++ b/doc/src/qnamespace.qdoc
@@ -41,6 +41,7 @@
/*!
\namespace Qt
+ \inmodule QtCore
\brief The Qt namespace contains miscellaneous identifiers
used throughout the Qt library.
diff --git a/doc/src/qsql.qdoc b/doc/src/qsql.qdoc
index 5315413..0f690e8 100644
--- a/doc/src/qsql.qdoc
+++ b/doc/src/qsql.qdoc
@@ -41,12 +41,12 @@
/*!
\namespace QSql
+ \inmodule QtSql
\brief The QSql namespace contains miscellaneous identifiers used throughout
the Qt SQL library.
\ingroup database
\mainclass
- \omit ### \module sql \endomit
\sa {QtSql Module}
*/
diff --git a/src/corelib/concurrent/qtconcurrentmap.cpp b/src/corelib/concurrent/qtconcurrentmap.cpp
index b8c753a..46d2400 100644
--- a/src/corelib/concurrent/qtconcurrentmap.cpp
+++ b/src/corelib/concurrent/qtconcurrentmap.cpp
@@ -41,6 +41,7 @@
/*!
\namespace QtConcurrent
+ \inmodule QtCore
\since 4.4
\brief The QtConcurrent namespace provides high-level APIs that make it
possible to write multi-threaded programs without using low-level
diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp
index a9f8ede..0169ea2 100644
--- a/src/opengl/qgl.cpp
+++ b/src/opengl/qgl.cpp
@@ -142,6 +142,7 @@ QGLSignalProxy *QGLSignalProxy::instance()
/*!
\namespace QGL
+ \inmodule QtOpenGL
\brief The QGL namespace specifies miscellaneous identifiers used
in the Qt OpenGL module.