Merge remote branch 'gerrit/master' into refactor

Conflicts:
	src/gui/image/qicon.cpp
	src/gui/image/qicon.h
	src/gui/image/qicon_p.h
	src/gui/text/qfontdatabase.cpp
	src/plugins/platforms/wayland/gl_integration/qwaylandglwindowsurface.cpp
	src/plugins/platforms/wayland/gl_integration/wayland_egl/qwaylandglcontext.cpp
	src/plugins/platforms/wayland/gl_integration/xcomposite_egl/qwaylandxcompositeeglwindow.cpp
	sync.profile

Change-Id: Ie0a23a12177ff51bf562e15b2dd41f071afb19b4

1 files changed, 48 insertions, 0 deletions

diff --git a/doc/src/examples/affine.qdoc b/doc/src/examples/affine.qdoc
new file mode 100644
index 0000000000..2d70fa8951
--- /dev/null
+++ b/doc/src/examples/affine.qdoc
@@ -0,0 +1,48 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:FDL$
+** GNU Free Documentation License
+** 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.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms
+** and conditions contained in a signed written agreement between you
+** and Nokia.
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example painting/affine
+    \title Affine Transformations
+
+    In this example we show Qt's ability to perform affine transformations
+    on painting operations.
+
+    \image affine-demo.png
+
+    Transformations can be performed on any kind of graphics drawn using QPainter.
+    The transformations used to display the vector graphics, images, and text can be adjusted
+    in the following ways:
+
+    \list
+    \o Dragging the red circle in the centre of each drawing moves it to a new position.
+    \o Dragging the displaced red circle causes the current drawing to be rotated about the
+       central circle. Rotation can also be controlled with the \key Rotate slider.
+    \o Scaling is controlled with the \key Scale slider.
+    \o Each drawing can be sheared with the \key Shear slider.
+    \endlist
+*/