diff options
| author | Jerome Pasion <jerome.pasion@digia.com> | 2013-09-03 17:33:17 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-04 18:52:29 +0200 |
| commit | 096499f69ac640c89a15e4473ee04578d35fc7b5 (patch) | |
| tree | e2f65b44c323920290b13b26999a11816501c3dd | |
| parent | 63b5082ea8e3e750af986f815474f7207006cb46 (diff) | |
Doc: Fixed information about the default modules when using qmake.
-Qt GUI and Qt Core are included by default
-Added entry about disabling "gui" in the .pro file
-Information placed in snippet files
Change-Id: I1c70dcac9ca2d443e9f658e2a27727d24a25cae1
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| -rw-r--r-- | src/corelib/doc/src/qtcore-index.qdoc | 2 | ||||
| -rw-r--r-- | src/corelib/doc/src/qtcore.qdoc | 4 | ||||
| -rw-r--r-- | src/gui/doc/snippets/code/doc_src_qtgui.pro | 4 | ||||
| -rw-r--r-- | src/gui/doc/src/qtgui.qdoc | 8 |
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 |