Merge branch 'stable' into dev

Conflicts:
	examples/widgets/painting/shared/shared.pri
	src/corelib/tools/qharfbuzz_p.h
	src/corelib/tools/qunicodetools.cpp
	src/plugins/platforms/windows/accessible/qwindowsaccessibility.cpp
	src/plugins/platforms/windows/qwindowsfontdatabase.cpp

Change-Id: Ibc9860abf570e5ce8b052fb88feb73ec35e64bd3

8 files changed, 85 insertions, 9 deletions

diff --git a/examples/touch/dials/dials.pro b/examples/touch/dials/dials.pro
index 0da1103432..aeba956892 100644
--- a/examples/touch/dials/dials.pro
+++ b/examples/touch/dials/dials.pro
@@ -1,10 +1,10 @@
+QT += widgets
+
 SOURCES += main.cpp
 FORMS += dials.ui
 
 # install
 target.path = $$[QT_INSTALL_EXAMPLES]/touch/dials
 INSTALLS += target
-QT += widgets
-
 
 simulator: warning(This example might not fully work on Simulator platform)
diff --git a/examples/touch/dials/doc/images/touch-dials-example.png b/examples/touch/dials/doc/images/touch-dials-example.png
new file mode 100644
index 0000000000..60e1776fc3
--- /dev/null
+++ b/examples/touch/dials/doc/images/touch-dials-example.png
diff --git a/examples/touch/dials/doc/src/touch-dials.qdoc b/examples/touch/dials/doc/src/touch-dials.qdoc
new file mode 100644
index 0000000000..c18d068e3f
--- /dev/null
+++ b/examples/touch/dials/doc/src/touch-dials.qdoc
@@ -0,0 +1,38 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:FDL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Free Documentation License Usage
+** Alternatively, this file may be used under the terms of the GNU Free
+** Documentation License version 1.3 as published by the Free Software
+** Foundation and appearing in the file included in the packaging of
+** this file.  Please review the following information to ensure
+** the GNU Free Documentation License version 1.3 requirements
+** will be met: http://www.gnu.org/copyleft/fdl.html.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example touch/dials
+    \title Touch Dials Example
+    \ingroup touchinputexamples
+    \brief Shows how to apply touch to a set of standard Qt widgets
+
+    The Touch Dials example shows how to apply touch to a set of
+    standard Qt widgets.
+
+    \image touch-dials-example.png
+*/
diff --git a/examples/touch/fingerpaint/fingerpaint.pro b/examples/touch/fingerpaint/fingerpaint.pro
index a9083b39ca..5391897af7 100644
--- a/examples/touch/fingerpaint/fingerpaint.pro
+++ b/examples/touch/fingerpaint/fingerpaint.pro
@@ -1,3 +1,6 @@
+QT += widgets
+qtHaveModule(printsupport): QT += printsupport
+
 HEADERS       = mainwindow.h \
                 scribblearea.h
 SOURCES       = main.cpp \
@@ -8,7 +11,4 @@ SOURCES       = main.cpp \
 target.path = $$[QT_INSTALL_EXAMPLES]/touch/fingerpaint
 INSTALLS += target
 
-QT += widgets
-!isEmpty(QT.printsupport.name): QT += printsupport
-
 simulator: warning(This example might not fully work on Simulator platform)
diff --git a/examples/touch/knobs/doc/images/touch-knobs-example.png b/examples/touch/knobs/doc/images/touch-knobs-example.png
new file mode 100644
index 0000000000..1cbd90d101
--- /dev/null
+++ b/examples/touch/knobs/doc/images/touch-knobs-example.png
diff --git a/examples/touch/knobs/doc/src/touch-knobs.qdoc b/examples/touch/knobs/doc/src/touch-knobs.qdoc
new file mode 100644
index 0000000000..548b0bad05
--- /dev/null
+++ b/examples/touch/knobs/doc/src/touch-knobs.qdoc
@@ -0,0 +1,38 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:FDL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Free Documentation License Usage
+** Alternatively, this file may be used under the terms of the GNU Free
+** Documentation License version 1.3 as published by the Free Software
+** Foundation and appearing in the file included in the packaging of
+** this file.  Please review the following information to ensure
+** the GNU Free Documentation License version 1.3 requirements
+** will be met: http://www.gnu.org/copyleft/fdl.html.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example touch/knobs
+    \title Touch Knobs Example
+    \ingroup touchinputexamples
+    \brief Shows how to create custom controls that accept touch input
+
+    The Touch Knobs example shows how to create custom controls that
+    accept touch input.
+
+    \image touch-knobs-example.png
+*/
diff --git a/examples/touch/knobs/knobs.pro b/examples/touch/knobs/knobs.pro
index 7540a4b2cf..6a10a0776f 100644
--- a/examples/touch/knobs/knobs.pro
+++ b/examples/touch/knobs/knobs.pro
@@ -1,10 +1,10 @@
+QT += widgets
+
 HEADERS = knob.h
 SOURCES = main.cpp knob.cpp
 
 # install
 target.path = $$[QT_INSTALL_EXAMPLES]/touch/knobs
 INSTALLS += target
-QT += widgets
-
 
 simulator: warning(This example might not fully work on Simulator platform)
diff --git a/examples/touch/pinchzoom/pinchzoom.pro b/examples/touch/pinchzoom/pinchzoom.pro
index df7ce246c3..5c101b2f5c 100644
--- a/examples/touch/pinchzoom/pinchzoom.pro
+++ b/examples/touch/pinchzoom/pinchzoom.pro
@@ -1,3 +1,5 @@
+QT += widgets
+
 HEADERS += \
         mouse.h \
         graphicsview.h
@@ -12,7 +14,5 @@ RESOURCES += \
 # install
 target.path = $$[QT_INSTALL_EXAMPLES]/touch/pinchzoom
 INSTALLS += target
-QT += widgets
-
 
 simulator: warning(This example might not fully work on Simulator platform)