From 096499f69ac640c89a15e4473ee04578d35fc7b5 Mon Sep 17 00:00:00 2001 From: Jerome Pasion Date: Tue, 3 Sep 2013 17:33:17 +0200 Subject: 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 --- src/gui/doc/snippets/code/doc_src_qtgui.pro | 4 ++++ src/gui/doc/src/qtgui.qdoc | 8 +++++++- 2 files changed, 11 insertions(+), 1 deletion(-) (limited to 'src/gui') 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 #! [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 -- cgit v1.2.3