summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/corelib/doc/src/qtcore-index.qdoc2
-rw-r--r--src/corelib/doc/src/qtcore.qdoc4
-rw-r--r--src/gui/doc/snippets/code/doc_src_qtgui.pro4
-rw-r--r--src/gui/doc/src/qtgui.qdoc8
4 files changed, 17 insertions, 1 deletions
diff --git a/src/corelib/doc/src/qtcore-index.qdoc b/src/corelib/doc/src/qtcore-index.qdoc
index 9568ea9f8e..fef5f6092b 100644
--- a/src/corelib/doc/src/qtcore-index.qdoc
+++ b/src/corelib/doc/src/qtcore-index.qdoc
@@ -37,6 +37,8 @@
\snippet code/doc_src_qtcore.cpp 0
+ If you use \l qmake to build your projects, Qt Core is included by default.
+
\section1 Core Functionalities
Qt adds these features to C++:
diff --git a/src/corelib/doc/src/qtcore.qdoc b/src/corelib/doc/src/qtcore.qdoc
index 88afad75c5..0ded568297 100644
--- a/src/corelib/doc/src/qtcore.qdoc
+++ b/src/corelib/doc/src/qtcore.qdoc
@@ -37,4 +37,8 @@
definitions of the module's classes, use the following directive:
\snippet code/doc_src_qtcore.cpp 0
+
+ If you use \l qmake to build your projects, \l{Qt Core} is included by
+ default.
+
*/
diff --git a/src/gui/doc/snippets/code/doc_src_qtgui.pro b/src/gui/doc/snippets/code/doc_src_qtgui.pro
index 51bb6c74ff..e705555336 100644
--- a/src/gui/doc/snippets/code/doc_src_qtgui.pro
+++ b/src/gui/doc/snippets/code/doc_src_qtgui.pro
@@ -1,3 +1,7 @@
#! [0]
#include <QtGui>
#! [0]
+
+#! [1]
+QT -= gui
+#! [1]
diff --git a/src/gui/doc/src/qtgui.qdoc b/src/gui/doc/src/qtgui.qdoc
index 75c74c8072..d22c380145 100644
--- a/src/gui/doc/src/qtgui.qdoc
+++ b/src/gui/doc/src/qtgui.qdoc
@@ -46,7 +46,10 @@
\snippet code/doc_src_qtgui.pro 0
- See the \l {Qt GUI} page for more details.
+ If you use \l qmake to build your projects, \l{Qt GUI} is included by
+ default. To disable Qt GUI, add the following line to your \c .pro file:
+
+ \snippet code/doc_src_qtgui.pro 1
*/
@@ -72,7 +75,10 @@
\snippet code/doc_src_qtgui.pro 0
+ If you use \l qmake to build your projects, Qt GUI is included by
+ default. To disable Qt GUI, add the following line to your \c .pro file:
+ \snippet code/doc_src_qtgui.pro 1
\section1 Application Windows