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

Change-Id: I1684b8409323c07a45b096526eff896bb6dbc13c

examples/xmlpatterns/README

@@ -3,36 +3,7 @@ Qt XML Patterns module.
 
 XQuery is a query language used to query XML in a concise and safe manner.
 
-The example launcher provided with Qt can be used to explore each of the
-examples in this directory.
+Documentation for these examples can be found via the Examples and Tutorials
+link in the main Qt documentation. The examples and their documentation can
+also be opened from the Examples tab of Qt Creator's Welcome mode.
 
-Documentation for these examples can be found via the Tutorial and Examples
-link in the main Qt documentation.
-
-
-Finding the Qt Examples and Demos launcher
-==========================================
-
-On Windows:
-
-The launcher can be accessed via the Windows Start menu. Select the menu
-entry entitled "Qt Examples and Demos" entry in the submenu containing
-the Qt tools.
-
-On Mac OS X:
-
-For the binary distribution, the qtdemo executable is installed in the
-/Developer/Applications/Qt directory. For the source distribution, it is
-installed alongside the other Qt tools on the path specified when Qt is
-configured.
-
-On Unix/Linux:
-
-The qtdemo executable is installed alongside the other Qt tools on the path
-specified when Qt is configured.
-
-On all platforms:
-
-The source code for the launcher can be found in the demos/qtdemo directory
-in the Qt package. This example is built at the same time as the Qt libraries,
-tools, examples, and demonstrations.

examples/xmlpatterns/recipes/forms/querywidget_mobiles.ui

@@ -62,7 +62,7 @@
       </widget>
       <widget class="QWidget" name="tab_3">
        <attribute name="title">
-        <string>Ouput Document</string>
+        <string>Output Document</string>
        </attribute>
        <layout class="QVBoxLayout" name="verticalLayout_4">
         <item>

src/xmlpatterns/doc/qtxmlpatterns.qdocconf

 include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
 
 # Name of the project which must match the outputdir. Determines the .index file
-project = qtxmlpatterns
+project = QtXmlPatterns
 
 # Directories in which to search for files to document and images.
 # By default set to the root directory of the project for sources
@@ -25,23 +25,23 @@ depends += qtcore qtxml qtwidgets qtdesigner
 # Defines the name of the project. You cannot use operators (+, =, -) in
 # the name. Properties for this project are set using a qhp.<projectname>.property
 # format.
-qhp.projects = qtxmlpatterns
+qhp.projects = QtXmlPatterns
 
 # Sets the name of the output qhp file.
-qhp.qtxmlpatterns.file = qtxmlpatterns.qhp
+qhp.QtXmlPatterns.file = qtxmlpatterns.qhp
 
 # Namespace for the output file. This namespace is used to distinguish between
 # different documentation files in Creator/Assistant.
-qhp.qtxmlpatterns.namespace = org.qt-project.qtxmlpatterns.$QT_VERSION_TAG
+qhp.QtXmlPatterns.namespace = org.qt-project.qtxmlpatterns.$QT_VERSION_TAG
 
 # Title for the package, will be the main title for the package in
 # Assistant/Creator.
-qhp.qtxmlpatterns.indexTitle = Qt XML Patterns
+qhp.QtXmlPatterns.indexTitle = Qt XML Patterns
 
 # Only update the name of the project for the next variables.
-qhp.qtxmlpatterns.virtualFolder  = qtxmlpatterns
-qhp.qtxmlpatterns.subprojects = classes
-qhp.qtxmlpatterns.subprojects.classes.title = C++ Classes
-qhp.qtxmlpatterns.subprojects.classes.indexTitle = Qt XML Patterns C++ Classes
-qhp.qtxmlpatterns.subprojects.classes.selectors = class fake:headerfile
-qhp.qtxmlpatterns.subprojects.classes.sortPages = true
+qhp.QtXmlPatterns.virtualFolder  = qtxmlpatterns
+qhp.QtXmlPatterns.subprojects = classes
+qhp.QtXmlPatterns.subprojects.classes.title = C++ Classes
+qhp.QtXmlPatterns.subprojects.classes.indexTitle = Qt XML Patterns C++ Classes
+qhp.QtXmlPatterns.subprojects.classes.selectors = class fake:headerfile
+qhp.QtXmlPatterns.subprojects.classes.sortPages = true

tests/auto/xmlpatternsschema/xmlpatternsschema.pro

@@ -6,5 +6,4 @@ SOURCES += tst_xmlpatternsschema.cpp \
 
 include (../xmlpatterns.pri)
 
-INCLUDEPATH += $$QT.xmlpatterns.private_includes
 DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0