Merge dev into 5.10

Change-Id: I4376b711fbf02ea978f5d347d34a4a6a0c95dab2

2 files changed, 24 insertions, 19 deletions

diff --git a/src/imports/settings/qqmlsettings.cpp b/src/imports/settings/qqmlsettings.cpp
index df67c04654..ed2f58e7c1 100644
--- a/src/imports/settings/qqmlsettings.cpp
+++ b/src/imports/settings/qqmlsettings.cpp
@@ -39,6 +39,7 @@
 
 #include "qqmlsettings_p.h"
 #include <qcoreevent.h>
+#include <qloggingcategory.h>
 #include <qsettings.h>
 #include <qpointer.h>
 #include <qjsvalue.h>
@@ -222,7 +223,7 @@ QT_BEGIN_NAMESPACE
     \sa QSettings
 */
 
-// #define SETTINGS_DEBUG
+Q_LOGGING_CATEGORY(lcSettings, "qt.labs.settings")
 
 static const int settingsWriteDelay = 500;
 
@@ -273,9 +274,7 @@ QSettings *QQmlSettingsPrivate::instance() const
 void QQmlSettingsPrivate::init()
 {
     if (!initialized) {
-#ifdef SETTINGS_DEBUG
-        qDebug() << "QQmlSettings: stored at" << instance()->fileName();
-#endif
+        qCDebug(lcSettings) << "QQmlSettings: stored at" << instance()->fileName();
         load();
         initialized = true;
     }
@@ -303,9 +302,7 @@ void QQmlSettingsPrivate::load()
         if (!currentValue.isNull() && (!previousValue.isValid()
                 || (currentValue.canConvert(previousValue.type()) && previousValue != currentValue))) {
             property.write(q, currentValue);
-#ifdef SETTINGS_DEBUG
-            qDebug() << "QQmlSettings: load" << property.name() << "setting:" << currentValue << "default:" << previousValue;
-#endif
+            qCDebug(lcSettings) << "QQmlSettings: load" << property.name() << "setting:" << currentValue << "default:" << previousValue;
         }
 
         // ensure that a non-existent setting gets written
@@ -326,9 +323,7 @@ void QQmlSettingsPrivate::store()
     QHash<const char *, QVariant>::const_iterator it = changedProperties.constBegin();
     while (it != changedProperties.constEnd()) {
         instance()->setValue(it.key(), it.value());
-#ifdef SETTINGS_DEBUG
-        qDebug() << "QQmlSettings: store" << it.key() << ":" << it.value();
-#endif
+        qCDebug(lcSettings) << "QQmlSettings: store" << it.key() << ":" << it.value();
         ++it;
     }
     changedProperties.clear();
@@ -344,9 +339,7 @@ void QQmlSettingsPrivate::_q_propertyChanged()
         const QMetaProperty &property = mo->property(i);
         const QVariant value = readProperty(property);
         changedProperties.insert(property.name(), value);
-#ifdef SETTINGS_DEBUG
-        qDebug() << "QQmlSettings: cache" << property.name() << ":" << value;
-#endif
+        qCDebug(lcSettings) << "QQmlSettings: cache" << property.name() << ":" << value;
     }
     if (timerId != 0)
         q->killTimer(timerId);
diff --git a/src/imports/testlib/TestCase.qml b/src/imports/testlib/TestCase.qml
index 7ff51bb6d6..9a279a3327 100644
--- a/src/imports/testlib/TestCase.qml
+++ b/src/imports/testlib/TestCase.qml
@@ -1321,15 +1321,27 @@ Item {
         if (ddy < (util.dragThreshold + 1))
             ddy = 0
 
+        var originalX = item.x;
+        var originalY = item.y;
+
         mousePress(item, x, y, button, modifiers, delay)
-        //trigger dragging
-        mouseMove(item, x + util.dragThreshold + 1, y + util.dragThreshold + 1, moveDelay, button)
+
+        // trigger dragging, this doesn't actually move the item yet
+        var triggerDragXPos = x + Math.min(util.dragThreshold + 1, dx);
+        var triggerDragYPos = y + Math.min(util.dragThreshold + 1, dy);
+        mouseMove(item, triggerDragXPos, triggerDragYPos, moveDelay, button)
+
         if (ddx > 0 || ddy > 0) {
-            mouseMove(item, x + ddx, y + ddy, moveDelay, button)
-            mouseMove(item, x + 2*ddx, y + 2*ddy, moveDelay, button)
+            // move the item by ddx, ddy
+            mouseMove(item, triggerDragXPos + ddx, triggerDragYPos + ddy, moveDelay, button)
+
+            // move the item by ddx, ddy again
+            // need to account for whether the previous move actually moved the item or not
+            mouseMove(item, triggerDragXPos + 2*ddx - (item.x - originalX), triggerDragYPos + 2*ddy - (item.y - originalY), moveDelay, button)
         }
-        mouseMove(item, x + dx, y + dy, moveDelay, button)
-        mouseRelease(item, x + dx, y + dy, button, modifiers, delay)
+        // Release, causes a final move
+        // need to account for whether the previous moves actually moved the item or not
+        mouseRelease(item, x + dx - (item.x - originalX), y + dy - (item.y - originalY), button, modifiers, delay)
     }
 
     /*!