Merge "Merge remote-tracking branch 'origin/5.13' into 5.14"

8 files changed, 96 insertions, 4 deletions

diff --git a/src/imports/folderlistmodel/qquickfolderlistmodel.cpp b/src/imports/folderlistmodel/qquickfolderlistmodel.cpp
index 6b76d63555..f5acfd86b7 100644
--- a/src/imports/folderlistmodel/qquickfolderlistmodel.cpp
+++ b/src/imports/folderlistmodel/qquickfolderlistmodel.cpp
@@ -539,6 +539,8 @@ QStringList QQuickFolderListModel::nameFilters() const
 void QQuickFolderListModel::setNameFilters(const QStringList &filters)
 {
     Q_D(QQuickFolderListModel);
+    if (d->nameFilters == filters)
+        return;
     d->fileInfoThread.setNameFilters(filters);
     d->nameFilters = filters;
 }
diff --git a/src/qml/jsruntime/qv4promiseobject.cpp b/src/qml/jsruntime/qv4promiseobject.cpp
index 27075e96a0..17d218a6eb 100644
--- a/src/qml/jsruntime/qv4promiseobject.cpp
+++ b/src/qml/jsruntime/qv4promiseobject.cpp
@@ -163,6 +163,7 @@ void ReactionHandler::executeReaction(ReactionEvent *event)
         ScopedFunctionObject reaction(scope);
         if (scope.hasException()) {
             reaction = capability->d()->reject.as<QV4::FunctionObject>();
+            result = scope.engine->catchException();
         } else {
             reaction = capability->d()->resolve.as<QV4::FunctionObject>();
         }
diff --git a/src/quick/handlers/qquickpointerdevicehandler.cpp b/src/quick/handlers/qquickpointerdevicehandler.cpp
index 449d726b78..90f31bf9fd 100644
--- a/src/quick/handlers/qquickpointerdevicehandler.cpp
+++ b/src/quick/handlers/qquickpointerdevicehandler.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2019 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtQuick module of the Qt Toolkit.
@@ -230,6 +230,55 @@ void QQuickPointerDeviceHandler::setAcceptedPointerTypes(QQuickPointerDevice::Po
        }
     }
     \endqml
+
+    If you set \c acceptedModifiers to an OR combination of modifier keys,
+    it means \e all of those modifiers must be pressed to activate the handler:
+
+    \qml
+    Item {
+       TapHandler {
+           acceptedModifiers: Qt.ControlModifier | Qt.AltModifier | Qt.ShiftModifier
+           onTapped: console.log("control-alt-shift-tapped")
+       }
+    }
+    \endqml
+
+    The available modifiers are as follows:
+
+    \value NoModifier       No modifier key is allowed.
+    \value ShiftModifier    A Shift key on the keyboard must be pressed.
+    \value ControlModifier  A Ctrl key on the keyboard must be pressed.
+    \value AltModifier      An Alt key on the keyboard must be pressed.
+    \value MetaModifier     A Meta key on the keyboard must be pressed.
+    \value KeypadModifier   A keypad button must be pressed.
+    \value GroupSwitchModifier X11 only (unless activated on Windows by a command line argument).
+                            A Mode_switch key on the keyboard must be pressed.
+    \value KeyboardModifierMask The handler does not care which modifiers are pressed.
+
+    If you need even more complex behavior than can be achieved with
+    combinations of multiple handlers with multiple modifier flags, you can
+    check the modifiers in JavaScript code:
+
+    \qml
+    Item {
+        TapHandler {
+            onTapped:
+                switch (point.modifiers) {
+                case Qt.ControlModifier | Qt.AltModifier:
+                    console.log("CTRL+ALT");
+                    break;
+                case Qt.ControlModifier | Qt.AltModifier | Qt.MetaModifier:
+                    console.log("CTRL+META+ALT");
+                    break;
+                default:
+                    console.log("other modifiers", point.modifiers);
+                    break;
+                }
+        }
+    }
+    \endqml
+
+    \sa Qt::KeyboardModifier
 */
 void QQuickPointerDeviceHandler::setAcceptedModifiers(Qt::KeyboardModifiers acceptedModifiers)
 {
diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp
index 4827f1ddd9..796ab6cdd7 100644
--- a/src/quick/items/qquickitem.cpp
+++ b/src/quick/items/qquickitem.cpp
@@ -8490,7 +8490,7 @@ void QQuickItemLayer::setMipmap(bool mipmap)
 
     \note ShaderEffectSource.RGB and ShaderEffectSource.Alpha should
     be used with caution, as support for these formats in the underlying
-    hardare and driver is often not present.
+    hardware and driver is often not present.
 
     \sa {Item Layers}
  */
diff --git a/src/quick/items/qquicktableview.cpp b/src/quick/items/qquicktableview.cpp
index db579c74bc..95fac30808 100644
--- a/src/quick/items/qquicktableview.cpp
+++ b/src/quick/items/qquicktableview.cpp
@@ -54,6 +54,7 @@
 /*!
     \qmltype TableView
     \inqmlmodule QtQuick
+    \since 5.12
     \ingroup qtquick-views
     \inherits Flickable
     \brief Provides a table view of items to display data from a model.
diff --git a/tests/auto/qml/qqmlpromise/data/promisehandlerthrows.qml b/tests/auto/qml/qqmlpromise/data/promisehandlerthrows.qml
new file mode 100644
index 0000000000..d23ea43e74
--- /dev/null
+++ b/tests/auto/qml/qqmlpromise/data/promisehandlerthrows.qml
@@ -0,0 +1,17 @@
+import QtQuick 2.12
+
+Item {
+    id: root
+    property string errorMessage
+    Component.onCompleted: () => {
+    let prom = Promise.reject("Some error")
+        .then(
+                o => {console.log("Never reached");},
+                err => {
+                    console.log("Rethrowing err");
+                    throw err;
+                }
+             )
+        .catch(err => root.errorMessage = err)
+    }
+}
diff --git a/tests/auto/qml/qqmlpromise/tst_qqmlpromise.cpp b/tests/auto/qml/qqmlpromise/tst_qqmlpromise.cpp
index 41850d0263..b430434526 100644
--- a/tests/auto/qml/qqmlpromise/tst_qqmlpromise.cpp
+++ b/tests/auto/qml/qqmlpromise/tst_qqmlpromise.cpp
@@ -83,6 +83,7 @@ private slots:
     void then_reject_non_callable();
     void then_resolve_multiple_then();
     void promiseChain();
+    void promiseHandlerThrows();
 
 private:
     void execute_test(QString testName);
@@ -285,6 +286,17 @@ void tst_qqmlpromise::promiseChain()
 
 }
 
+void tst_qqmlpromise::promiseHandlerThrows()
+{
+    QQmlEngine engine;
+    QQmlComponent component(&engine, testFileUrl("promisehandlerthrows.qml"));
+    QVERIFY(component.isReady());
+    QTest::ignoreMessage(QtDebugMsg, "Rethrowing err");
+    QScopedPointer<QObject> root(component.create());
+    QVERIFY(root);
+    QTRY_VERIFY(root->property("errorMessage") == QLatin1String("Some error"));
+}
+
 
 QTEST_MAIN(tst_qqmlpromise)
 
diff --git a/tests/manual/pointer/tapWithModifiers.qml b/tests/manual/pointer/tapWithModifiers.qml
index 8ca1c1bd63..da3c0cb30a 100644
--- a/tests/manual/pointer/tapWithModifiers.qml
+++ b/tests/manual/pointer/tapWithModifiers.qml
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2017 The Qt Company Ltd.
+** Copyright (C) 2019 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the manual tests of the Qt Toolkit.
@@ -40,6 +40,16 @@ Item {
         onTapped: console.log("tapped with no modifiers")
     }
     TapHandler {
-        onTapped: console.log("tapped with modifiers " + point.event.modifiers)
+        onTapped:
+            switch (point.modifiers) {
+            case Qt.ControlModifier | Qt.AltModifier:
+                console.log("CTRL+ALT");
+                break;
+            case Qt.ControlModifier | Qt.AltModifier | Qt.MetaModifier:
+                console.log("CTRL+META+ALT");
+                break;
+            default:
+                console.log("other modifiers", point.modifiers)
+            }
     }
 }