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

Change-Id: Iba61035910c46627e5e1c3824757da7b3d573657

11 files changed, 25 insertions, 20 deletions

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)