Merge remote-tracking branch 'origin/5.5' into 5.6

Conflicts:
	src/quickwidgets/qquickwidget.cpp

Change-Id: I3e2326bc86a9d3adaafbe3830b75ce9afa81c45b

1 files changed, 17 insertions, 2 deletions

diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp
index 80bad4dc27..fdbd4c90a3 100644
--- a/src/quick/items/qquickitem.cpp
+++ b/src/quick/items/qquickitem.cpp
@@ -7445,9 +7445,11 @@ bool QQuickItem::event(QEvent *ev)
         dropEvent(static_cast<QDropEvent*>(ev));
         break;
 #endif // QT_NO_DRAGANDDROP
+#ifndef QT_NO_GESTURES
     case QEvent::NativeGesture:
         ev->ignore();
         break;
+#endif // QT_NO_GESTURES
     default:
         return QObject::event(ev);
     }
@@ -7560,6 +7562,8 @@ QQuickItemLayer::~QQuickItemLayer()
 
     None of the other layer properties have any effect when the layer
     is disabled.
+
+    \sa {Item Layers}
  */
 void QQuickItemLayer::setEnabled(bool e)
 {
@@ -7684,7 +7688,7 @@ void QQuickItemLayer::deactivateEffect()
     The effect is typically a \l ShaderEffect component, although any \l Item component can be
     assigned. The effect should have a source texture property with a name matching \l layer.samplerName.
 
-    \sa layer.samplerName
+    \sa layer.samplerName, {Item Layers}
  */
 
 void QQuickItemLayer::setEffect(QQmlComponent *component)
@@ -7724,6 +7728,8 @@ void QQuickItemLayer::setEffect(QQmlComponent *component)
 
     \note Some OpenGL ES 2 implementations do not support mipmapping of
     non-power-of-two textures.
+
+    \sa {Item Layers}
  */
 
 void QQuickItemLayer::setMipmap(bool mipmap)
@@ -7757,6 +7763,7 @@ void QQuickItemLayer::setMipmap(bool mipmap)
     be used with caution, as support for these formats in the underlying
     hardare and driver is often not present.
 
+    \sa {Item Layers}
  */
 
 void QQuickItemLayer::setFormat(QQuickShaderEffectSource::Format f)
@@ -7779,6 +7786,8 @@ void QQuickItemLayer::setFormat(QQuickShaderEffectSource::Format f)
     rendered into the texture. The source rectangle can be larger than
     the item itself. If the rectangle is null, which is the default,
     then the whole item is rendered to the texture.
+
+    \sa {Item Layers}
  */
 
 void QQuickItemLayer::setSourceRect(const QRectF &sourceRect)
@@ -7797,6 +7806,8 @@ void QQuickItemLayer::setSourceRect(const QRectF &sourceRect)
     \qmlproperty bool QtQuick::Item::layer.smooth
 
     Holds whether the layer is smoothly transformed.
+
+    \sa {Item Layers}
  */
 
 void QQuickItemLayer::setSmooth(bool s)
@@ -7820,6 +7831,8 @@ void QQuickItemLayer::setSmooth(bool s)
     \note Some platforms have a limit on how small framebuffer objects can be,
     which means the actual texture size might be larger than the requested
     size.
+
+    \sa {Item Layers}
  */
 
 void QQuickItemLayer::setSize(const QSize &size)
@@ -7850,6 +7863,8 @@ void QQuickItemLayer::setSize(const QSize &size)
 
     \note Some OpenGL ES 2 implementations do not support the GL_REPEAT
     wrap mode with non-power-of-two textures.
+
+    \sa {Item Layers}
  */
 
 void QQuickItemLayer::setWrapMode(QQuickShaderEffectSource::WrapMode mode)
@@ -7901,7 +7916,7 @@ void QQuickItemLayer::setTextureMirroring(QQuickShaderEffectSource::TextureMirro
     This value must match the name of the effect's source texture property
     so that the Item can pass the layer's offscreen surface to the effect correctly.
 
-    \sa layer.effect, ShaderEffect
+    \sa layer.effect, ShaderEffect, {Item Layers}
  */
 
 void QQuickItemLayer::setName(const QByteArray &name) {