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

 Conflicts:
	src/qml/compiler/qqmlirbuilder.cpp

Change-Id: I2cfda470515e2df778ad3c89105c07344af07c6d

5 files changed, 34 insertions, 6 deletions

diff --git a/src/quick/accessible/qaccessiblequickitem.cpp b/src/quick/accessible/qaccessiblequickitem.cpp
index 98e7663c96..b87203c3ef 100644
--- a/src/quick/accessible/qaccessiblequickitem.cpp
+++ b/src/quick/accessible/qaccessiblequickitem.cpp
@@ -382,6 +382,22 @@ QString QAccessibleQuickItem::text(QAccessible::Text textType) const
     return QString();
 }
 
+void QAccessibleQuickItem::setText(QAccessible::Text textType, const QString &text)
+{
+    if (role() != QAccessible::EditableText)
+        return;
+    if (textType != QAccessible::Value)
+        return;
+
+    if (QTextDocument *doc = textDocument()) {
+        doc->setPlainText(text);
+        return;
+    }
+    auto textPropertyName = "text";
+    if (object()->metaObject()->indexOfProperty(textPropertyName) >= 0)
+        object()->setProperty(textPropertyName, text);
+}
+
 void *QAccessibleQuickItem::interface_cast(QAccessible::InterfaceType t)
 {
     QAccessible::Role r = role();
diff --git a/src/quick/accessible/qaccessiblequickitem_p.h b/src/quick/accessible/qaccessiblequickitem_p.h
index 5375d37bf0..931e995f0f 100644
--- a/src/quick/accessible/qaccessiblequickitem_p.h
+++ b/src/quick/accessible/qaccessiblequickitem_p.h
@@ -83,6 +83,7 @@ public:
     QAccessible::State state() const override;
     QAccessible::Role role() const override;
     QString text(QAccessible::Text) const override;
+    void setText(QAccessible::Text, const QString &text) override;
 
     bool isAccessible() const;
 
diff --git a/src/quick/items/context2d/qquickcontext2d.cpp b/src/quick/items/context2d/qquickcontext2d.cpp
index 5640721c6f..0f104a122f 100644
--- a/src/quick/items/context2d/qquickcontext2d.cpp
+++ b/src/quick/items/context2d/qquickcontext2d.cpp
@@ -2000,7 +2000,7 @@ QV4::ReturnedValue QQuickJSContext2D::method_set_miterLimit(const QV4::FunctionO
     \since QtQuick 2.11
     Returns an array of qreals representing the dash pattern of the line.
 
-    \sa setLineDash()
+    \sa setLineDash(), lineDashOffset
   */
 QV4::ReturnedValue QQuickJSContext2DPrototype::method_getLineDash(const QV4::FunctionObject *b, const QV4::Value *thisObject, const QV4::Value *, int)
 {
@@ -2022,7 +2022,7 @@ QV4::ReturnedValue QQuickJSContext2DPrototype::method_getLineDash(const QV4::Fun
 /*!
     \qmlmethod QtQuick::Context2D::setLineDash(array pattern)
     \since QtQuick 2.11
-    Sets the dash pattern to the given pattern
+    Sets the dash pattern to the given pattern.
 
     \a pattern a list of numbers that specifies distances to alternately draw a line and a gap.
 
@@ -2041,7 +2041,7 @@ QV4::ReturnedValue QQuickJSContext2DPrototype::method_getLineDash(const QV4::Fun
     \endcode
     \endtable
 
-    \sa setLineDash
+    \sa getLineDash(), lineDashOffset
   */
 QV4::ReturnedValue QQuickJSContext2DPrototype::method_setLineDash(const QV4::FunctionObject *b, const QV4::Value *thisObject, const QV4::Value *argv, int argc)
 {
@@ -2083,8 +2083,10 @@ QV4::ReturnedValue QQuickJSContext2DPrototype::method_setLineDash(const QV4::Fun
     \qmlproperty real QtQuick::Context2D::lineDashOffset
     \since QtQuick 2.11
 
-     Holds the current line dash offset
-     The default line dash ofset value is 0
+     Holds the current line dash offset.
+     The default line dash offset value is \c 0.
+
+     \sa getLineDash(), setLineDash()
  */
 QV4::ReturnedValue QQuickJSContext2D::method_get_lineDashOffset(const QV4::FunctionObject *b, const QV4::Value *thisObject, const QV4::Value *, int)
 {
diff --git a/src/quick/items/qquickaccessibleattached_p.h b/src/quick/items/qquickaccessibleattached_p.h
index 215a1e5db6..e292c280df 100644
--- a/src/quick/items/qquickaccessibleattached_p.h
+++ b/src/quick/items/qquickaccessibleattached_p.h
@@ -128,13 +128,19 @@ public:
             case QAccessible::Button:
             case QAccessible::MenuItem:
             case QAccessible::PageTab:
-            case QAccessible::EditableText:
             case QAccessible::SpinBox:
             case QAccessible::ComboBox:
             case QAccessible::Terminal:
             case QAccessible::ScrollBar:
                 m_state.focusable = true;
                 break;
+            case QAccessible::EditableText:
+                m_state.editable = true;
+                m_state.focusable = true;
+                break;
+            case QAccessible::StaticText:
+                m_state.readOnly = true;
+                break;
             default:
                 break;
             }
diff --git a/src/quick/items/qquicktextcontrol.cpp b/src/quick/items/qquicktextcontrol.cpp
index a7a90c9134..caef24293a 100644
--- a/src/quick/items/qquicktextcontrol.cpp
+++ b/src/quick/items/qquicktextcontrol.cpp
@@ -1297,6 +1297,7 @@ void QQuickTextControlPrivate::inputMethodEvent(QInputMethodEvent *e)
             || e->preeditString() != cursor.block().layout()->preeditAreaText()
             || e->replacementLength() > 0;
     bool forceSelectionChanged = false;
+    int oldCursorPos = cursor.position();
 
     cursor.beginEditBlock();
     if (isGettingInput) {
@@ -1365,6 +1366,8 @@ void QQuickTextControlPrivate::inputMethodEvent(QInputMethodEvent *e)
     QTextCursorPrivate *cursor_d = QTextCursorPrivate::getPrivate(&cursor);
     if (cursor_d)
         cursor_d->setX();
+    if (cursor.position() != oldCursorPos)
+        emit q->cursorPositionChanged();
     q->updateCursorRectangle(oldPreeditCursor != preeditCursor || forceSelectionChanged || isGettingInput);
     selectionChanged(forceSelectionChanged);
 }