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

Change-Id: Iba61035910c46627e5e1c3824757da7b3d573657

27 files changed, 50 insertions, 41 deletions

diff --git a/src/quick/accessible/qaccessiblequickitem.cpp b/src/quick/accessible/qaccessiblequickitem.cpp
index 381be66637..72c19f8004 100644
--- a/src/quick/accessible/qaccessiblequickitem.cpp
+++ b/src/quick/accessible/qaccessiblequickitem.cpp
@@ -180,7 +180,7 @@ QAccessible::Role QAccessibleQuickItem::role() const
     bool ok;
     QAccessible::Role role = (QAccessible::Role)v.toInt(&ok);
     if (!ok)    // Not sure if this check is needed.
-        role = QAccessible::Pane;
+        role = QAccessible::Client;
     return role;
 }
 
diff --git a/src/quick/doc/images/visualitemmodel.png b/src/quick/doc/images/visualitemmodel.png
deleted file mode 100644
index 5e6d1325b2..0000000000
--- a/src/quick/doc/images/visualitemmodel.png
+++ /dev/null
diff --git a/src/quick/doc/qtquick.qdocconf b/src/quick/doc/qtquick.qdocconf
index a810ac7330..1f800d2a31 100644
--- a/src/quick/doc/qtquick.qdocconf
+++ b/src/quick/doc/qtquick.qdocconf
@@ -67,6 +67,8 @@ excludedirs += ../../imports/dialogs \
                ../../imports/models \
                ../../../examples/quick/dialogs
 
+manifestmeta.thumbnail.names += "QtQuick/Threaded ListModel Example"
+
 navigation.landingpage = "Qt Quick"
 navigation.cppclassespage = "Qt Quick C++ Classes"
 navigation.qmltypespage = "Qt Quick QML Types"
diff --git a/src/quick/doc/src/concepts/modelviewsdata/cppmodels.qdoc b/src/quick/doc/src/concepts/modelviewsdata/cppmodels.qdoc
index f1e13e127c..49e4998ee1 100644
--- a/src/quick/doc/src/concepts/modelviewsdata/cppmodels.qdoc
+++ b/src/quick/doc/src/concepts/modelviewsdata/cppmodels.qdoc
@@ -57,7 +57,7 @@ to a QStringList:
 \snippet models/stringlistmodel/main.cpp 0
 
 The complete source code for this example is available in
-\l {quick/modelviews/stringlistmodel}{examples/quick/modelviews/stringlistmodel}
+\l {models/stringlistmodel}{examples/quick/models/stringlistmodel}
 within the Qt install directory.
 
 \b{Note:} There is no way for the view to know that the contents of a QStringList
@@ -94,7 +94,7 @@ object, as they are easily available via the \c modelData
 object.
 
 The complete source code for this example is available in
-\l {quick/modelviews/objectlistmodel}{examples/quick/modelviews/objectlistmodel}
+\l {models/objectlistmodel}{examples/quick/models/objectlistmodel}
 within the Qt install directory.
 
 Note: There is no way for the view to know that the contents of a QList
@@ -140,7 +140,7 @@ QAbstractItemModel::beginInsertRows(), and so on. See the \l {Model subclassing
 more information.
 
 The complete source code for this example is available in
-\l {quick/modelviews/abstractitemmodel}{examples/quick/modelviews/abstractitemmodel}
+\l {models/abstractitemmodel}{examples/quick/models/abstractitemmodel}
 within the Qt install directory.
 
 QAbstractItemModel presents a hierarchy of tables, but the views currently provided by QML
diff --git a/src/quick/doc/src/concepts/statesanimations/animations.qdoc b/src/quick/doc/src/concepts/statesanimations/animations.qdoc
index e4e208863b..080b786f9b 100644
--- a/src/quick/doc/src/concepts/statesanimations/animations.qdoc
+++ b/src/quick/doc/src/concepts/statesanimations/animations.qdoc
@@ -183,7 +183,7 @@ There are several methods of assigning behavior animations to properties. The
 \c{Behavior on <property>} declaration is a convenient way of assigning a
 behavior animation onto a property.
 
-See the \l {declarative/animation/behaviors}{Behaviors example} for a
+See the \l {Qt Quick Examples - Animation} for a
 demonstration of behavioral animations.
 
 \section1 Playing Animations in Parallel or in Sequence
@@ -235,7 +235,7 @@ are also different parameters to control the curve, some of which are exclusive
 to a particular curve. For more information about the easing curves, visit the
 \l {PropertyAnimation::easing.type}{easing} documentation.
 
-The \l{declarative/animation/easing}{easing example} visually demonstrates each
+The \l{animation/easing}{easing example} visually demonstrates each
 of the different easing types.
 
 \section2 Other Animation Types
diff --git a/src/quick/doc/src/concepts/statesanimations/states.qdoc b/src/quick/doc/src/concepts/statesanimations/states.qdoc
index d9978d454e..b0d7765c66 100644
--- a/src/quick/doc/src/concepts/statesanimations/states.qdoc
+++ b/src/quick/doc/src/concepts/statesanimations/states.qdoc
@@ -121,7 +121,7 @@ interpolation behaviors are definable. The
 {Animation and Transitions} article has more information about creating state
 animations.
 
-The \l {declarative/animation/states}{States and Transitions example}
+The \l {animation/states}{States and Transitions example}
 demonstrates how to declare a basic set of states and apply animated
 transitions between them.
 
diff --git a/src/quick/doc/src/examples.qdoc b/src/quick/doc/src/examples.qdoc
index 3669a31de0..51525b8f57 100644
--- a/src/quick/doc/src/examples.qdoc
+++ b/src/quick/doc/src/examples.qdoc
@@ -126,7 +126,7 @@ Creator.
         \list
         \li \l{Qt Quick Controls - Gallery}{Controls Gallery}
         \li \l{Qt Quick System Dialog Examples}{Dialog Examples}
-        \li \l{Qt Quick Controls - Calendar Example}{Calendar Example}
+        \li \l{Calendar Example}
         \li \l{Qt Quick Controls - Table View Example}{TableView}
         \li \l{Qt Quick Examples - Text}{Text and Fonts}
         \li \l{Qt Quick Examples - Toggle Switch}{Custom Toggle Switch}
diff --git a/src/quick/doc/src/tutorial.qdoc b/src/quick/doc/src/tutorial.qdoc
index 75ca1b8d55..91032f1d92 100644
--- a/src/quick/doc/src/tutorial.qdoc
+++ b/src/quick/doc/src/tutorial.qdoc
@@ -223,5 +223,5 @@ This is equivalent to writing the two transitions separately.
 The \l ParallelAnimation type makes sure that the two types of animations (number and color) start at the same time.
 We could also run them one after the other by using \l SequentialAnimation instead.
 
-For more details on states and transitions, see \l {Qt Quick States} and the \l{quick/animation/states}{states and transitions example}.
+For more details on states and transitions, see \l {Qt Quick States} and the \l{animation/states}{states and transitions example}.
 */
diff --git a/src/quick/items/qquickborderimage.cpp b/src/quick/items/qquickborderimage.cpp
index b4a89b3107..16c8d94e8d 100644
--- a/src/quick/items/qquickborderimage.cpp
+++ b/src/quick/items/qquickborderimage.cpp
@@ -138,7 +138,7 @@ QT_BEGIN_NAMESPACE
     to use \l{BorderImage::horizontalTileMode}{BorderImage.Round} instead of
     \l{BorderImage::horizontalTileMode}{BorderImage.Repeat} in cases like these.
 
-    The \l{declarative/imageelements/borderimage}{BorderImage example} shows how a BorderImage
+    The Border Image example in \l{Qt Quick Examples - Image Elements} shows how a BorderImage
     can be used to simulate a shadow effect on a rectangular item.
 
     \section1 Image Loading
diff --git a/src/quick/items/qquickflickable.cpp b/src/quick/items/qquickflickable.cpp
index d1bad78d41..45566f2e89 100644
--- a/src/quick/items/qquickflickable.cpp
+++ b/src/quick/items/qquickflickable.cpp
@@ -677,7 +677,7 @@ is finished.
     \dots 8
     \snippet qml/flickableScrollbar.qml 1
 
-    \sa {declarative/customitems/scrollbar}{scrollbar example}
+    \sa {customitems/scrollbar}{UI Components: Scrollbar Example}
 */
 QQuickFlickable::QQuickFlickable(QQuickItem *parent)
   : QQuickItem(*(new QQuickFlickablePrivate), parent)
@@ -1374,15 +1374,15 @@ void QQuickFlickablePrivate::replayDelayedPress()
         delayedPressTimer.stop();
 
         // If we have the grab, release before delivering the event
-        QQuickWindow *w = q->window();
-        if (w && (w->mouseGrabberItem() == q)) {
-            q->ungrabMouse();
+        if (QQuickWindow *w = q->window()) {
+            if (w->mouseGrabberItem() == q)
+                q->ungrabMouse();
+
+            // Use the event handler that will take care of finding the proper item to propagate the event
+            replayingPressEvent = true;
+            QQuickWindowPrivate::get(w)->deliverMouseEvent(mouseEvent.data());
+            replayingPressEvent = false;
         }
-
-        // Use the event handler that will take care of finding the proper item to propagate the event
-        replayingPressEvent = true;
-        QQuickWindowPrivate::get(w)->deliverMouseEvent(mouseEvent.data());
-        replayingPressEvent = false;
     }
 }
 
diff --git a/src/quick/items/qquickflipable.cpp b/src/quick/items/qquickflipable.cpp
index 1ea5e57656..63466cf52d 100644
--- a/src/quick/items/qquickflipable.cpp
+++ b/src/quick/items/qquickflipable.cpp
@@ -127,7 +127,7 @@ public:
     state, and \l {Animation and Transitions in Qt Quick} for more information on how
     animations work within transitions.
 
-    \sa {declarative/customitems/flipable}{Flipable example}
+    \sa {customitems/flipable}{UI Components: Flipable Example}
 */
 QQuickFlipable::QQuickFlipable(QQuickItem *parent)
 : QQuickItem(*(new QQuickFlipablePrivate), parent)
diff --git a/src/quick/items/qquickimage.cpp b/src/quick/items/qquickimage.cpp
index f8323a6bc3..5df9e630db 100644
--- a/src/quick/items/qquickimage.cpp
+++ b/src/quick/items/qquickimage.cpp
@@ -153,7 +153,7 @@ QQuickImagePrivate::QQuickImagePrivate()
     size bounded via the \l sourceSize property. This is especially important for content
     that is loaded from external sources or provided by the user.
 
-    \sa {declarative/imageelements/image}{Image example}, QQuickImageProvider
+    \sa {Qt Quick Examples - Image Elements}, QQuickImageProvider
 */
 
 QQuickImage::QQuickImage(QQuickItem *parent)
@@ -288,7 +288,7 @@ void QQuickImagePrivate::setPixmap(const QQuickPixmap &pixmap)
     Note that \c clip is \c false by default which means that the item might
     paint outside its bounding rectangle even if the fillMode is set to \c PreserveAspectCrop.
 
-    \sa {declarative/imageelements/image}{Image example}
+    \sa {Qt Quick Examples - Image Elements}
 */
 QQuickImage::FillMode QQuickImage::fillMode() const
 {
diff --git a/src/quick/items/qquickimagebase.cpp b/src/quick/items/qquickimagebase.cpp
index 66a56cc8bf..bf67cbef26 100644
--- a/src/quick/items/qquickimagebase.cpp
+++ b/src/quick/items/qquickimagebase.cpp
@@ -332,6 +332,11 @@ void QQuickImageBase::resolve2xLocalFile(const QUrl &url, qreal targetDevicePixe
     Q_ASSERT(sourceUrl);
     Q_ASSERT(sourceDevicePixelRatio);
 
+    // Bail out if "@2x" image loading is disabled, don't change the source url or devicePixelRatio.
+    static bool disable2xImageLoading = !qgetenv("QT_HIGHDPI_DISABLE_2X_IMAGE_LOADING").isEmpty();
+    if (disable2xImageLoading)
+        return;
+
     QString localFile = QQmlFile::urlToLocalFileOrQrc(url);
 
     // Non-local file path: @2x loading is not supported.
diff --git a/src/quick/items/qquicklistview.cpp b/src/quick/items/qquicklistview.cpp
index ec13fa5a6b..d1e8b43416 100644
--- a/src/quick/items/qquicklistview.cpp
+++ b/src/quick/items/qquicklistview.cpp
@@ -1939,7 +1939,7 @@ QQuickListView::~QQuickListView()
     highlight item is \c 0.
 
     \sa highlightItem, highlightFollowsCurrentItem,
-    {Qt Quick Examples - Views#Highlight demonstrates adding a custom highlight to a ListView.}{ListView highlight example}
+    {Qt Quick Examples - Views#Highlight}{ListView highlight example}
 */
 
 /*!
@@ -2254,7 +2254,7 @@ void QQuickListView::setOrientation(QQuickListView::Orientation orientation)
     differing sections will result in a section header being created
     even if that section exists elsewhere.
 
-    \sa {quick/views/listview}{ListView examples}
+    \sa {Qt Quick Examples - Views}{ListView examples}
 */
 QQuickViewSection *QQuickListView::sectionCriteria()
 {
diff --git a/src/quick/items/qquickmousearea.cpp b/src/quick/items/qquickmousearea.cpp
index f2f90935a3..2bb9158d51 100644
--- a/src/quick/items/qquickmousearea.cpp
+++ b/src/quick/items/qquickmousearea.cpp
@@ -253,7 +253,7 @@ bool QQuickMouseAreaPrivate::propagateHelper(QQuickMouseEvent *ev, QQuickItem *i
 
     \snippet qml/mousearea/mousearea.qml intro-extended
 
-    \sa MouseEvent, {declarative/touchinteraction/mousearea}{MouseArea example},
+    \sa MouseEvent, {mousearea}{MouseArea example},
     {Important Concepts In Qt Quick - User Input}
 */
 
diff --git a/src/quick/items/qquicktext.cpp b/src/quick/items/qquicktext.cpp
index cbdea3917a..7a4027890c 100644
--- a/src/quick/items/qquicktext.cpp
+++ b/src/quick/items/qquicktext.cpp
@@ -1227,7 +1227,7 @@ void QQuickTextPrivate::ensureDoc()
 
     Text provides read-only text. For editable text, see \l TextEdit.
 
-    \sa {declarative/text/fonts}{Fonts example}
+    \sa {Qt Quick Examples - Text#Fonts}{Fonts example}
 */
 QQuickText::QQuickText(QQuickItem *parent)
 : QQuickImplicitSizeItem(*(new QQuickTextPrivate), parent)
diff --git a/src/quick/items/qquicktextedit.cpp b/src/quick/items/qquicktextedit.cpp
index 5280301675..b042e30483 100644
--- a/src/quick/items/qquicktextedit.cpp
+++ b/src/quick/items/qquicktextedit.cpp
@@ -112,7 +112,7 @@ TextEdit {
     You can translate between cursor positions (characters from the start of the document) and pixel
     points using positionAt() and positionToRectangle().
 
-    \sa Text, TextInput, {examples/quick/text/textselection}{Text Selection example}
+    \sa Text, TextInput
 */
 
 /*!
diff --git a/src/quick/items/qquicktextinput.cpp b/src/quick/items/qquicktextinput.cpp
index 4220ae9eb4..f3f9d0b5aa 100644
--- a/src/quick/items/qquicktextinput.cpp
+++ b/src/quick/items/qquicktextinput.cpp
@@ -87,7 +87,7 @@ DEFINE_BOOL_CONFIG_OPTION(qmlDisableDistanceField, QML_DISABLE_DISTANCEFIELD)
     On Mac OS X, the Up/Down key bindings for Home/End are explicitly disabled.
     If you want such bindings (on any platform), you will need to construct them in QML.
 
-    \sa TextEdit, Text, {declarative/text/textselection}{Text Selection example}
+    \sa TextEdit, Text
 */
 QQuickTextInput::QQuickTextInput(QQuickItem* parent)
 : QQuickImplicitSizeItem(*(new QQuickTextInputPrivate), parent)
diff --git a/src/quick/items/qquicktranslate.cpp b/src/quick/items/qquicktranslate.cpp
index 14f8c204f3..ebf9f616a2 100644
--- a/src/quick/items/qquicktranslate.cpp
+++ b/src/quick/items/qquicktranslate.cpp
@@ -336,7 +336,7 @@ public:
 
     \image axisrotation.png
 
-    \sa {declarative/customitems/dialcontrol}{Dial Control example}, {Qt Quick Demo - Clocks}
+    \sa {customitems/dialcontrol}{Dial Control example}, {Qt Quick Demo - Clocks}
 */
 QQuickRotation::QQuickRotation(QObject *parent)
     : QQuickTransform(*new QQuickRotationPrivate, parent)
diff --git a/src/quick/scenegraph/qsgrenderloop.cpp b/src/quick/scenegraph/qsgrenderloop.cpp
index b4cfd1c514..73b64b4f9b 100644
--- a/src/quick/scenegraph/qsgrenderloop.cpp
+++ b/src/quick/scenegraph/qsgrenderloop.cpp
@@ -93,8 +93,12 @@ void QSGRenderLoop::cleanup()
     foreach (QQuickWindow *w, s_instance->windows()) {
         QQuickWindowPrivate *wd = QQuickWindowPrivate::get(w);
         if (wd->windowManager == s_instance) {
+           // windowDestroyed() triggers a sendPostedEvent(DeferredDelete),
+           // so wd will be null if the window was deleteLater()'ed
+           bool wasDeleted = wd->wasDeleted;
            s_instance->windowDestroyed(w);
-           wd->windowManager = 0;
+           if (!wasDeleted)
+               wd->windowManager = 0;
         }
     }
     delete s_instance;
diff --git a/src/quick/util/qquickanimation.cpp b/src/quick/util/qquickanimation.cpp
index 10d2176d0a..544e2d4daa 100644
--- a/src/quick/util/qquickanimation.cpp
+++ b/src/quick/util/qquickanimation.cpp
@@ -2344,8 +2344,7 @@ void QQuickPropertyAnimation::setTo(const QVariant &t)
     groups of three points defining a curve from 0,0 to 1,1 - control1, control2,
     end point: [cx1, cy1, cx2, cy2, endx, endy, ...].  The last point must be 1,1.
 
-    See the \l {qml/animation/easing}{easing} example for a demonstration of
-    the different easing settings.
+    See the \l {Qt Quick Examples - Animation#Easing Curves}{Easing Curves} for a demonstration of the different easing settings.
 //! propertyanimation.easing
 */
 QEasingCurve QQuickPropertyAnimation::easing() const
diff --git a/src/quick/util/qquickbehavior.cpp b/src/quick/util/qquickbehavior.cpp
index 74e5b40ab1..2e37682811 100644
--- a/src/quick/util/qquickbehavior.cpp
+++ b/src/quick/util/qquickbehavior.cpp
@@ -99,7 +99,7 @@ public:
     state change. For general advice on using Behaviors to animate state changes, see
     \l{Using Qt Quick Behaviors with States}.
 
-    \sa {Animation and Transitions in Qt Quick}, {declarative/animation/behaviors}{Behavior example}, {Qt QML}
+    \sa {Animation and Transitions in Qt Quick}, {Qt Quick Examples - Animation#Behaviors}{Behavior example}, {Qt QML}
 */
 
 
diff --git a/src/quick/util/qquickfontloader.cpp b/src/quick/util/qquickfontloader.cpp
index c0672359ef..26f34b46c6 100644
--- a/src/quick/util/qquickfontloader.cpp
+++ b/src/quick/util/qquickfontloader.cpp
@@ -170,7 +170,7 @@ QHash<QUrl, QQuickFontObject*> QQuickFontLoaderPrivate::fonts;
     }
     \endqml
 
-    \sa {declarative/text/fonts}{Fonts example}
+    \sa {Qt Quick Examples - Text#Fonts}{Qt Quick Examples - Text Fonts}
 */
 QQuickFontLoader::QQuickFontLoader(QObject *parent)
     : QObject(*(new QQuickFontLoaderPrivate), parent)
diff --git a/src/quick/util/qquickimageprovider.cpp b/src/quick/util/qquickimageprovider.cpp
index 16c18d2594..24d6ad7a1f 100644
--- a/src/quick/util/qquickimageprovider.cpp
+++ b/src/quick/util/qquickimageprovider.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the QtQuick module of the Qt Toolkit.
@@ -203,9 +203,8 @@ QImage QQuickTextureFactory::image() const
 
     \image imageprovider.png
 
-    A complete example is available in Qt's
-    \l {qml/imageprovider}{examples/quick/imageprovider}
-    directory. Note the example registers the provider via a \l{QQmlExtensionPlugin}{plugin}
+    See the \l {imageprovider}{Image Provider Example} for the complete implementation.
+    Note that the example registers the provider via a \l{QQmlExtensionPlugin}{plugin}
     instead of registering it in the application \c main() function as shown above.
 
 
diff --git a/src/quick/util/qquickpropertychanges.cpp b/src/quick/util/qquickpropertychanges.cpp
index 5b5b8cac3c..d7167793ed 100644
--- a/src/quick/util/qquickpropertychanges.cpp
+++ b/src/quick/util/qquickpropertychanges.cpp
@@ -132,7 +132,7 @@ QT_BEGIN_NAMESPACE
     changed implicitly through their parent's state, they should be set explicitly in all PropertyChanges.
     An item will still not be enabled/visible if one of its parents is not enabled or visible.
 
-    \sa {declarative/animation/states}{states example}, {Qt Quick States}{Qt Quick States}, {Qt QML}
+    \sa {Qt Quick Examples - Animation#States}{States example}, {Qt Quick States}, {Qt QML}
 */
 
 /*!
diff --git a/src/quick/util/qquickstate.cpp b/src/quick/util/qquickstate.cpp
index 2cc8a4e50d..641dea3dc7 100644
--- a/src/quick/util/qquickstate.cpp
+++ b/src/quick/util/qquickstate.cpp
@@ -150,7 +150,7 @@ QQuickStateOperation::QQuickStateOperation(QObjectPrivate &dd, QObject *parent)
     \note Setting the state of an object from within another state of the same object is
     not allowed.
 
-    \sa {declarative/animation/states}{states example}, {Qt Quick States}{Qt Quick States},
+    \sa {Qt Quick Examples - Animation#States}{States example}, {Qt Quick States},
     {Animation and Transitions in Qt Quick}{Transitions}, {Qt QML}
 */
 QQuickState::QQuickState(QObject *parent)
diff --git a/src/quick/util/qquicktransition.cpp b/src/quick/util/qquicktransition.cpp
index dcfc4549c2..6d1f646f95 100644
--- a/src/quick/util/qquicktransition.cpp
+++ b/src/quick/util/qquicktransition.cpp
@@ -96,7 +96,7 @@ QT_BEGIN_NAMESPACE
     \l Behavior, the Transition animation overrides the \l Behavior for that
     state change.
 
-    \sa {Animation and Transitions in Qt Quick}, {declarative/animation/states}{states example}, {Qt Quick States}{Qt Quick States}, {Qt QML}
+    \sa {Animation and Transitions in Qt Quick}, {Qt Quick Examples - Animation#States}{States example}, {Qt Quick States}, {Qt QML}
 */
 
 //ParallelAnimationWrapper allows us to do a "callback" when the animation finishes, rather than connecting