Merge remote-tracking branch 'origin/dev' into wip/cmake

Removed dependencies.yaml because we don't use it yet in wip/cmake.
Fixed conflict in qmlcachegen.cpp.

Change-Id: Ie1060c737bee1daa85779903598e5b6d5020d922

1 files changed, 12 insertions, 2 deletions

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)
+            }
     }
 }