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

 Conflicts:
	tests/auto/quick/pointerhandlers/flickableinterop/data/FlashAnimation.qml
	tests/auto/quick/pointerhandlers/flickableinterop/data/Slider.qml
	tests/auto/quick/pointerhandlers/flickableinterop/data/TapHandlerButton.qml
	tests/auto/quick/pointerhandlers/flickableinterop/data/flickableWithHandlers.qml
	tests/auto/quick/pointerhandlers/multipointtoucharea_interop/data/pinchDragMPTA.qml
	tests/auto/quick/pointerhandlers/qquickdraghandler/data/DragAnywhereSlider.qml
	tests/auto/quick/pointerhandlers/qquickdraghandler/data/FlashAnimation.qml
	tests/auto/quick/pointerhandlers/qquickdraghandler/data/Slider.qml
	tests/auto/quick/pointerhandlers/qquickdraghandler/data/draggables.qml
	tests/auto/quick/pointerhandlers/qquickdraghandler/data/multipleSliders.qml
	tests/auto/quick/pointerhandlers/qquicktaphandler/data/Button.qml
	tests/auto/quick/pointerhandlers/qquicktaphandler/data/FlashAnimation.qml
	tests/auto/quick/pointerhandlers/qquicktaphandler/data/buttons.qml
	tests/manual/pointer/content/FakeFlickable.qml
	tests/manual/pointer/content/FlashAnimation.qml
	tests/manual/pointer/content/MomentumAnimation.qml
	tests/manual/pointer/content/MouseAreaButton.qml
	tests/manual/pointer/content/MouseAreaSlider.qml
	tests/manual/pointer/content/MptaButton.qml
	tests/manual/pointer/content/MultiButton.qml
	tests/manual/pointer/content/ScrollBar.qml
	tests/manual/pointer/content/Slider.qml
	tests/manual/pointer/content/TapHandlerButton.qml
	tests/manual/pointer/fakeFlickable.qml
	tests/manual/pointer/flickableWithHandlers.qml
	tests/manual/pointer/flingAnimation.qml
	tests/manual/pointer/joystick.qml
	tests/manual/pointer/main.cpp
	tests/manual/pointer/main.qml
	tests/manual/pointer/map.qml
	tests/manual/pointer/map2.qml
	tests/manual/pointer/mixer.qml
	tests/manual/pointer/multibuttons.qml
	tests/manual/pointer/photosurface.qml
	tests/manual/pointer/pinchDragFlingMPTA.qml
	tests/manual/pointer/pinchHandler.qml
	tests/manual/pointer/singlePointHandlerProperties.qml
	tests/manual/pointer/tapHandler.qml
	tests/manual/pointer/tapWithModifiers.qml
	tests/manual/shapestest/main.cpp

Change-Id: I4f233a521305fab1ebfecbac801da192434ed524

1 files changed, 30 insertions, 3 deletions

diff --git a/src/imports/window/plugins.qmltypes b/src/imports/window/plugins.qmltypes
index cea2a910a7..4ae23a093e 100644
--- a/src/imports/window/plugins.qmltypes
+++ b/src/imports/window/plugins.qmltypes
@@ -4,7 +4,7 @@ import QtQuick.tooling 1.2
 // It is used for QML tooling purposes only.
 //
 // This file was auto-generated by:
-// 'qmlplugindump -nonrelocatable QtQuick.Window 2.3'
+// 'qmlplugindump -nonrelocatable QtQuick.Window 2.10'
 
 Module {
     dependencies: ["QtQuick 2.8"]
@@ -43,10 +43,16 @@ Module {
     Component {
         name: "QQuickScreenInfo"
         prototype: "QObject"
-        exports: ["QtQuick.Window/ScreenInfo 2.3"]
+        exports: [
+            "QtQuick.Window/ScreenInfo 2.10",
+            "QtQuick.Window/ScreenInfo 2.3"
+        ]
         isCreatable: false
-        exportMetaObjectRevisions: [2]
+        exportMetaObjectRevisions: [10, 2]
         Property { name: "name"; type: "string"; isReadonly: true }
+        Property { name: "manufacturer"; revision: 10; type: "string"; isReadonly: true }
+        Property { name: "model"; revision: 10; type: "string"; isReadonly: true }
+        Property { name: "serialNumber"; revision: 10; type: "string"; isReadonly: true }
         Property { name: "width"; type: "int"; isReadonly: true }
         Property { name: "height"; type: "int"; isReadonly: true }
         Property { name: "desktopAvailableWidth"; type: "int"; isReadonly: true }
@@ -58,6 +64,9 @@ Module {
         Property { name: "orientation"; type: "Qt::ScreenOrientation"; isReadonly: true }
         Property { name: "virtualX"; revision: 1; type: "int"; isReadonly: true }
         Property { name: "virtualY"; revision: 1; type: "int"; isReadonly: true }
+        Signal { name: "manufacturerChanged"; revision: 10 }
+        Signal { name: "modelChanged"; revision: 10 }
+        Signal { name: "serialNumberChanged"; revision: 10 }
         Signal { name: "desktopGeometryChanged" }
         Signal { name: "virtualXChanged"; revision: 1 }
         Signal { name: "virtualYChanged"; revision: 1 }
@@ -74,6 +83,13 @@ Module {
                 "ContextNotAvailable": 1
             }
         }
+        Enum {
+            name: "TextRenderType"
+            values: {
+                "QtTextRendering": 0,
+                "NativeTextRendering": 1
+            }
+        }
         Property { name: "data"; type: "QObject"; isList: true; isReadonly: true }
         Property { name: "color"; type: "QColor" }
         Property { name: "contentItem"; type: "QQuickItem"; isReadonly: true; isPointer: true }
@@ -296,6 +312,17 @@ Module {
             Parameter { name: "arg"; type: "int" }
         }
         Method {
+            name: "setGeometry"
+            Parameter { name: "posx"; type: "int" }
+            Parameter { name: "posy"; type: "int" }
+            Parameter { name: "w"; type: "int" }
+            Parameter { name: "h"; type: "int" }
+        }
+        Method {
+            name: "setGeometry"
+            Parameter { name: "rect"; type: "QRect" }
+        }
+        Method {
             name: "setMinimumWidth"
             Parameter { name: "w"; type: "int" }
         }