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

 Conflicts:
	.qmake.conf
	src/quicktemplates2/qquickabstractbutton_p.h

Change-Id: I265cbd2ce51beaf2afef99292c2e2798dadb4ba3

1 files changed, 59 insertions, 15 deletions

diff --git a/src/quicktemplates2/qquickspinbox.cpp b/src/quicktemplates2/qquickspinbox.cpp
index 588944af..f7af2015 100644
--- a/src/quicktemplates2/qquickspinbox.cpp
+++ b/src/quicktemplates2/qquickspinbox.cpp
@@ -36,6 +36,7 @@
 
 #include "qquickspinbox_p.h"
 #include "qquickcontrol_p_p.h"
+#include "qquickdeferredexecute_p_p.h"
 
 #include <QtGui/qguiapplication.h>
 #include <QtGui/qstylehints.h>
@@ -166,6 +167,30 @@ public:
     Qt::InputMethodHints inputMethodHints;
 };
 
+class QQuickSpinButtonPrivate : public QObjectPrivate
+{
+    Q_DECLARE_PUBLIC(QQuickSpinButton)
+
+public:
+    QQuickSpinButtonPrivate()
+        : pressed(false),
+          hovered(false),
+          indicator(nullptr)
+    {
+    }
+
+    static QQuickSpinButtonPrivate *get(QQuickSpinButton *button)
+    {
+        return button->d_func();
+    }
+
+    void executeIndicator(bool complete = false);
+
+    bool pressed;
+    bool hovered;
+    QQuickDeferredPointer<QQuickItem> indicator;
+};
+
 int QQuickSpinBoxPrivate::boundValue(int value, bool wrap) const
 {
     bool inverted = from > to;
@@ -934,9 +959,24 @@ void QQuickSpinBox::wheelEvent(QWheelEvent *event)
 }
 #endif
 
+void QQuickSpinBox::classBegin()
+{
+    Q_D(QQuickSpinBox);
+    QQuickControl::classBegin();
+
+    QQmlContext *context = qmlContext(this);
+    if (context) {
+        QQmlEngine::setContextForObject(d->up, context);
+        QQmlEngine::setContextForObject(d->down, context);
+    }
+}
+
 void QQuickSpinBox::componentComplete()
 {
     Q_D(QQuickSpinBox);
+    QQuickSpinButtonPrivate::get(d->up)->executeIndicator(true);
+    QQuickSpinButtonPrivate::get(d->down)->executeIndicator(true);
+
     QQuickControl::componentComplete();
     if (!d->setValue(d->value, /* allowWrap = */ false, /* modified = */ false)) {
         d->updateDisplayText();
@@ -961,6 +1001,8 @@ void QQuickSpinBox::contentItemChange(QQuickItem *newItem, QQuickItem *oldItem)
 
     if (newItem) {
         newItem->setActiveFocusOnTab(true);
+        if (d->activeFocus)
+            newItem->forceActiveFocus(d->focusReason);
 #if QT_CONFIG(cursor)
         if (d->editable)
             newItem->setCursor(Qt::IBeamCursor);
@@ -1004,20 +1046,19 @@ void QQuickSpinBox::accessibilityActiveChanged(bool active)
 }
 #endif
 
-class QQuickSpinButtonPrivate : public QObjectPrivate
+static inline QString indicatorName() { return QStringLiteral("indicator"); }
+
+void QQuickSpinButtonPrivate::executeIndicator(bool complete)
 {
-public:
-    QQuickSpinButtonPrivate()
-        : pressed(false),
-          hovered(false),
-          indicator(nullptr)
-    {
-    }
+    Q_Q(QQuickSpinButton);
+    if (indicator.wasExecuted())
+        return;
 
-    bool pressed;
-    bool hovered;
-    QQuickItem *indicator;
-};
+    if (!indicator)
+        quickBeginDeferred(q, indicatorName(), indicator);
+    if (complete)
+        quickCompleteDeferred(q, indicatorName(), indicator);
+}
 
 QQuickSpinButton::QQuickSpinButton(QQuickSpinBox *parent)
     : QObject(*(new QQuickSpinButtonPrivate), parent)
@@ -1042,7 +1083,9 @@ void QQuickSpinButton::setPressed(bool pressed)
 
 QQuickItem *QQuickSpinButton::indicator() const
 {
-    Q_D(const QQuickSpinButton);
+    QQuickSpinButtonPrivate *d = const_cast<QQuickSpinButtonPrivate *>(d_func());
+    if (!d->indicator)
+        d->executeIndicator();
     return d->indicator;
 }
 
@@ -1052,14 +1095,15 @@ void QQuickSpinButton::setIndicator(QQuickItem *indicator)
     if (d->indicator == indicator)
         return;
 
-    QQuickControlPrivate::destroyDelegate(d->indicator, d->parent);
+    delete d->indicator;
     d->indicator = indicator;
 
     if (indicator) {
         if (!indicator->parentItem())
             indicator->setParentItem(static_cast<QQuickItem *>(parent()));
     }
-    emit indicatorChanged();
+    if (!d->indicator.isExecuting())
+        emit indicatorChanged();
 }
 
 bool QQuickSpinButton::isHovered() const