Merge remote-tracking branch 'origin/release' into stable

Change-Id: If29ca1b27da4592d40a7678837c359f75dac1209

6 files changed, 76 insertions, 46 deletions

diff --git a/src/tools/qdoc/doc/examples/cpp.qdoc b/src/tools/qdoc/doc/examples/cpp.qdoc.sample
index 08286b956a..08286b956a 100644
--- a/src/tools/qdoc/doc/examples/cpp.qdoc
+++ b/src/tools/qdoc/doc/examples/cpp.qdoc.sample
diff --git a/src/tools/qdoc/doc/examples/qml.qdoc b/src/tools/qdoc/doc/examples/qml.qdoc.sample
index d913c6f164..d913c6f164 100644
--- a/src/tools/qdoc/doc/examples/qml.qdoc
+++ b/src/tools/qdoc/doc/examples/qml.qdoc.sample
diff --git a/src/tools/qdoc/doc/files/qtgui.qdocconf b/src/tools/qdoc/doc/files/qtgui.qdocconf
new file mode 100644
index 0000000000..5073dd7f0f
--- /dev/null
+++ b/src/tools/qdoc/doc/files/qtgui.qdocconf
@@ -0,0 +1,50 @@
+include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
+
+project                 = QtGui
+description             = Qt GUI Reference Documentation
+url                     = http://qt-project.org/doc/qt-$QT_VER/qtgui
+version                 = $QT_VERSION
+
+examplesinstallpath     = gui
+
+qhp.projects            = QtGui
+
+qhp.QtGui.file         = qtgui.qhp
+qhp.QtGui.namespace           = org.qt-project.qtgui.$QT_VERSION_TAG
+qhp.QtGui.virtualFolder       = qtgui
+qhp.QtGui.indexTitle          = Qt GUI
+qhp.QtGui.indexRoot           =
+
+qhp.QtGui.filterAttributes    = qtgui $QT_VERSION qtrefdoc
+qhp.QtGui.customFilters.Qt.name = Qtgui $QT_VERSION
+qhp.QtGui.customFilters.Qt.filterAttributes = qtgui $QT_VERSION
+
+qhp.QtGui.subprojects         = classes
+qhp.QtGui.subprojects.classes.title = C++ Classes
+qhp.QtGui.subprojects.classes.indexTitle = Qt GUI C++ Classes
+qhp.QtGui.subprojects.classes.selectors = class fake:headerfile
+qhp.QtGui.subprojects.classes.sortPages = true
+
+tagfile                 = ../../../doc/qtgui/qtgui.tags
+
+depends += \
+    qtcore \
+    qtnetwork \
+    qtopengl \
+    qtsvg \
+    qtqml \
+    qtquick \
+    qtwidgets \
+    qtdoc
+
+headerdirs  += ..
+
+sourcedirs  += .. \
+               ../../../examples/gui/doc/src
+
+exampledirs += ../../../examples/gui \
+               snippets
+
+imagedirs   += images \
+               ../../../examples/gui/doc/images \
+               ../../../doc/src/images \
diff --git a/src/tools/qdoc/doc/qdoc-guide/qtwritingstyle-cpp.qdoc b/src/tools/qdoc/doc/qdoc-guide/qtwritingstyle-cpp.qdoc
index 4ad1f19f67..2095c4e7cb 100644
--- a/src/tools/qdoc/doc/qdoc-guide/qtwritingstyle-cpp.qdoc
+++ b/src/tools/qdoc/doc/qdoc-guide/qtwritingstyle-cpp.qdoc
@@ -41,7 +41,7 @@ Note that the documentation must be in the implementation files such as \c .cpp.
 Class documentation is generated using the \l{class-command}{\\class} command and
 the name of the class as the first argument.
 
-\snippet examples/cpp.qdoc class
+\snippet examples/cpp.qdoc.sample class
 
 \l{Context commands} add information about the class, such as its module or
 which version the class was added.
@@ -79,7 +79,7 @@ Typically, function documentation immediately precedes the implementation of the
 function in the \c .cpp file. For function documentation that is not immediately
 above the implementation, the \l{fn-command}{\\fn} is needed.
 
-\snippet examples/cpp.qdoc function
+\snippet examples/cpp.qdoc.sample function
 
 The function documentation starts with a verb, indicating the operation the
 function performs. This also applies to constructors and destructors.
@@ -102,7 +102,7 @@ The \l{a-command}{\\a} command marks the parameter in the documentation.
 The return type documentation should link to the type documentation or be
 marked with the \l{c-command}{\\c} command in the case of boolean values.
 
-\snippet examples/cpp.qdoc return
+\snippet examples/cpp.qdoc.sample return
 
 \section1 Properties
 
@@ -110,7 +110,7 @@ The property documentation resides immediately above the read function's
 implementation. The \l{topic-commands}{topic command} for properties is
 \l{property-command}{\\property}.
 
-\snippet examples/cpp.qdoc property
+\snippet examples/cpp.qdoc.sample property
 
 Property documentation usually starts with "This property...", but these are
 alternate expressions:
@@ -142,7 +142,7 @@ The \l{topic-commands}{topic command} for signals, notifiers, and slots
 is \l{fn-command}{\\fn}. Signal documentation state when they are triggered
 or emitted.
 
-\snippet examples/cpp.qdoc signals
+\snippet examples/cpp.qdoc.sample signals
 
 Signal documentation typically begin with "This signal is triggered when...".
 Here are alternate styles:
@@ -164,7 +164,7 @@ notifiers together. To refer to a specifc version of a notifier or signal,
 simply refer to the property and mention that there are different versions of
 the notifier.
 
-\snippet examples/cpp.qdoc overloaded notifier
+\snippet examples/cpp.qdoc.sample overloaded notifier
 
 \section1 Enums, Namespaces, and other Types
 
@@ -181,7 +181,7 @@ continues with the type description.
 For enumerations, the \l{value-command}{\\value} command is for listing the
 values. QDoc creates a table of values for the enum.
 
-\snippet examples/cpp.qdoc enums
+\snippet examples/cpp.qdoc.sample enums
 
 */
 
diff --git a/src/tools/qdoc/doc/qdoc-guide/qtwritingstyle-qml.qdoc b/src/tools/qdoc/doc/qdoc-guide/qtwritingstyle-qml.qdoc
index 2d67e62f94..7ca0abed71 100644
--- a/src/tools/qdoc/doc/qdoc-guide/qtwritingstyle-qml.qdoc
+++ b/src/tools/qdoc/doc/qdoc-guide/qtwritingstyle-qml.qdoc
@@ -60,7 +60,7 @@ does not exist. The class documentation may be marked as
 
 The \l{qmltype-command}{\\qmltype} command is for QML type documentation.
 
-\snippet examples/qml.qdoc qmltype
+\snippet examples/qml.qdoc.sample qmltype
 
 The \l{instantiates-command}{\\instantiates} accepts the C++ class which
 implements the QML type as the argument. For types implemented in QML, this
@@ -108,7 +108,7 @@ with the \l{qmlsignal-command}{\\qmlsignal} command. Signal documentation
 must include the condition for emitting the signal, mention the corresponding
 signal handler, and document whether the signal accepts a parameter.
 
-\snippet examples/qml.qdoc signals
+\snippet examples/qml.qdoc.sample signals
 
 These are the possible documentation styles for signals:
 \list
@@ -127,7 +127,7 @@ documentation must reside immediately above the function declaration.
 The function documentation starts with a verb, indicating the operation the
 function performs.
 
-\snippet examples/qml.qdoc function
+\snippet examples/qml.qdoc.sample function
 
 Some common verbs for function documentation:
 \list
@@ -153,7 +153,7 @@ QML enumerations are documented as QML properties with the
 \l{qmlproperty-command}{\\qmlproperty} command. The type of the property
 is \c enumeration.
 
-\snippet examples/qml.qdoc enums
+\snippet examples/qml.qdoc.sample enums
 
 The QDoc comment lists the values of the enumeration. If the enumeration is
 implemented in C++, the documentation may link to the corresponding C++
diff --git a/src/tools/qdoc/doc/qdoc-manual.qdoc b/src/tools/qdoc/doc/qdoc-manual.qdoc
index b715b200bf..4a4b1db6ff 100644
--- a/src/tools/qdoc/doc/qdoc-manual.qdoc
+++ b/src/tools/qdoc/doc/qdoc-manual.qdoc
@@ -66,7 +66,7 @@
           \li \l {HTML Specific Configuration Variables}
           \li \l {Supporting Derived Projects}
           \li \l {Example Manifest Files}
-          \li \l {qt.qdocconf}
+          \li \l {qtgui.qdocconf}
           \li \l {minimum.qdocconf}
           \li \l {Generating DITA XML Output}
         \endlist
@@ -7179,13 +7179,13 @@
 
     \list
     \li A minimum configuration file: \l minimum.qdocconf
-    \li The Qt configuration file: \l qt.qdocconf
+    \li The Qt configuration file: \l qtgui.qdocconf
     \endlist
 */
 
 /*!
     \page 21-1-minimum-qdocconf.html
-    \previouspage qt.qdocconf
+    \previouspage qtgui.qdocconf
     \contentspage QDoc Manual
     \nextpage Generating DITA XML Output
 
@@ -7195,14 +7195,14 @@
 */
 
 /*!
-    \page 21-2-qt-qdocconf.html
+    \page 21-2-qtgui-qdocconf.html
     \previouspage Supporting Derived Projects
     \contentspage QDoc Manual
     \nextpage minimum.qdocconf
 
-    \title qt.qdocconf
+    \title qtgui.qdocconf
 
-    \quotefile files/qt.qdocconf
+    \quotefile files/qtgui.qdocconf
 */
 
 /*!
@@ -7548,10 +7548,9 @@
     The general syntax is \tt {extraimages.\e{format} = \e image}. The
     file extension is optional.
 
-    For example, in \l qt.qdocconf we use a couple of images within
-    the HTML.postheader variable which value is pure HTML. For that
-    reason, these images are specified using the \c extraimages
-    variable:
+    For example, if additional images are used within the HTML.postheader
+    value, then these images must also be specified using the \c
+    extraimages variable:
 
     \code
         extraimages.HTML = qt-logo
@@ -7819,7 +7818,7 @@
 
     Currently, C++ is the only language that QDoc understands. It is
     also the default language, and doesn't really need to be
-    specified. But for example in \l qt.qdocconf:
+    specified.
 
     \code
         language = Cpp
@@ -7889,7 +7888,7 @@
     The \c outputdir variable specifies the directory where QDoc will
     put the generated documentation.
 
-    In qt.qdocconf:
+    For example:
 
     \code
         outputdir = $QTDIR/doc/html
@@ -7972,8 +7971,6 @@
     The \c sourcedirs variable specifies the directories containing
     the \c .cpp or \c .qdoc files used in the documentation.
 
-    For example in \l qt.qdocconf
-
     \code
         sourcedirs = $QTDIR/src \
                      $QTDIR/doc/src \
@@ -8157,7 +8154,7 @@
     The \c versionsym variable specifies a C++ preprocessor symbol
     that defines the version number of the documented software.
 
-    For example in \l qt.qdocconf:
+    For example:
 
     \code
         versionsym = QT_VERSION_STR
@@ -8270,7 +8267,7 @@
     Cpp.ignoredirectives} variables, non-standard constructs
     (typically macros) can result in erroneous documentation.
 
-    In \l qt.qdocconf:
+    For example:
 
     \code
     Cpp.ignoredirectives = Q_DECLARE_INTERFACE \
@@ -8324,8 +8321,6 @@
     Cpp.ignoredirectives} variables, non-standard constructs
     (typically macros) can result in erroneous documentation.
 
-    In \l qt.qdocconf:
-
     \code
     Cpp.ignoretokens = QAXFACTORY_EXPORT \
                        QM_EXPORT_CANVAS \
@@ -8389,18 +8384,12 @@
     quotation marks. Note that if the value spans several lines, each
     line needs to be enclosed by quotation marks.
 
-    For example in \l qt.qdocconf:
-
     \code
         HTML.footer = "<p /><address><hr /><div align=\"center\">\n" \
                       ...
                       "</tr></table></div></address>"
     \endcode
 
-    The complete variable entry in \l qt.qdocconf provides the
-    standard footer of the \l {http://doc.qt.digia.com/4.0/index.html}
-    {Qt Reference Documentation}.
-
     \target HTML.postheader-variable
     \section1 HTML.postheader
 
@@ -8414,8 +8403,6 @@
     marks. Note that if the value spans several lines, each line needs
     to be enclosed by quotation marks.
 
-    For example in \l qt.qdocconf:
-
     \code
      HTML.postheader = "<table border=\"0\"..." \
                        ...
@@ -8426,8 +8413,6 @@
                        "</table>"
     \endcode
 
-    The complete variable entry in \l qt.qdocconf provides the
-    standard header of the \l {http://doc.qt.digia.com/}
     {Qt Reference Documentation}.
 
     \target HTML.style-variable
@@ -8440,8 +8425,6 @@
     marks. Note that if the value spans several lines, each line needs
     to be enclosed by quotation marks.
 
-    For example in \l qt.qdocconf:
-
     \code
     HTML.style = "h3.fn,span.fn" \
                  "{ margin-left: 1cm; text-indent: -1cm; }\n" \
@@ -8473,7 +8456,7 @@
     \endcode
 
     QDoc expects to find stylesheets in the directory containing the
-    \l qt.qdocconf file, and it will copy those specified to the output
+    \l qtgui.qdocconf file, and it will copy those specified to the output
     directory alongside the HTML pages.
 
 */
@@ -8565,7 +8548,7 @@
     This feature makes use of the comprehensive indexes generated by
     QDoc when it creates the Qt reference documentation.
 
-    For example, \l qt.qdocconf (the configuration file for Qt)
+    For example, \l qtgui.qdocconf (the configuration file for Qt)
     contains the following variable definitions:
 
     \code
@@ -8585,9 +8568,6 @@
     In a mini-project, you can use an index file by defining an \l
     indexes configuration variable in your \c .qdocconf file.
 
-    For example, you can create a \c qtcreator.qdocconf file to help you
-    check the Qt Creator documentation:
-
     \code
         project                 = QtCreator
         description             = Qt Creator Manual