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

Conflicts:
	src/quicktemplates2/qquickabstractbutton_p.h
	src/quicktemplates2/qquickbuttongroup_p.h
	src/quicktemplates2/qquickrangeslider.cpp
	src/quicktemplates2/qquickrangeslider_p.h
	src/quicktemplates2/qquickswipeview_p.h
	src/quicktemplates2/qquicktextarea.cpp
	src/quicktemplates2/qquicktextarea_p.h
	src/quicktemplates2/qquicktextfield_p.h

Change-Id: I7cba8783b1dd85a4db534222e36572ee05dd01d0

4 files changed, 22 insertions, 7 deletions

diff --git a/tests/auto/controls/data/tst_scrollbar.qml b/tests/auto/controls/data/tst_scrollbar.qml
index bc424a27..d515db7e 100644
--- a/tests/auto/controls/data/tst_scrollbar.qml
+++ b/tests/auto/controls/data/tst_scrollbar.qml
@@ -704,7 +704,7 @@ TestCase {
     }
 
     function test_overshoot() {
-        var container = flickable.createObject(testCase)
+        var container = createTemporaryObject(flickable, testCase)
         verify(container)
         waitForRendering(container)
 
@@ -733,8 +733,6 @@ TestCase {
         horizontal.position = 0.8
         compare(horizontal.contentItem.x, horizontal.leftPadding + 0.8 * horizontal.availableWidth)
         compare(horizontal.contentItem.width, 0.2 * horizontal.availableWidth)
-
-        container.destroy()
     }
 
     function test_orientation() {
diff --git a/tests/auto/controls/data/tst_textfield.qml b/tests/auto/controls/data/tst_textfield.qml
index 6a40f053..0fee7363 100644
--- a/tests/auto/controls/data/tst_textfield.qml
+++ b/tests/auto/controls/data/tst_textfield.qml
@@ -420,4 +420,19 @@ TestCase {
         mouseClick(control, rect.x + rect.width / 2, rect.y + rect.height / 2)
         compare(control.selectedText, "Qt Quick Controls 2 TextArea")
     }
+
+    // QTBUG-64048
+    function test_rightClick() {
+        var control = createTemporaryObject(textField, testCase, {text: "TextField", selectByMouse: true})
+        verify(control)
+
+        control.selectAll()
+        compare(control.selectedText, "TextField")
+
+        mouseClick(control, control.width / 2, control.height / 2, Qt.RightButton)
+        compare(control.selectedText, "TextField")
+
+        mouseClick(control, control.width / 2, control.height / 2, Qt.LeftButton | Qt.RightButton)
+        compare(control.selectedText, "")
+    }
 }
diff --git a/tests/manual/viewinqwidget/main.cpp b/tests/manual/viewinqwidget/main.cpp
index c7050bc1..80cbb415 100644
--- a/tests/manual/viewinqwidget/main.cpp
+++ b/tests/manual/viewinqwidget/main.cpp
@@ -39,6 +39,7 @@
 #include <QVBoxLayout>
 #include <QDebug>
 #include <QDesktopWidget>
+#include <QDir>
 #include <QGroupBox>
 #include <QQmlApplicationEngine>
 #include <QQmlError>
@@ -66,8 +67,9 @@ int main(int argc, char *argv[])
     }
     hLayout->addWidget(groupBox);
 
-    const QUrl gallerySource(QLatin1String("qrc:/gallery.qml"));
-    QQmlApplicationEngine engine(gallerySource);
+    const QString gallerySource =
+        QDir::cleanPath(QLatin1String(SRCDIR"../../../examples/quickcontrols2/gallery/gallery.qml"));
+    QQmlApplicationEngine engine(QUrl::fromLocalFile(gallerySource));
     QObject *root = engine.rootObjects().value(0, nullptr);
     if (!root || !root->isWindowType()) {
         qWarning() << "Load error" << gallerySource;
diff --git a/tests/manual/viewinqwidget/viewinqwidget.pro b/tests/manual/viewinqwidget/viewinqwidget.pro
index 9b7cba00..649829d4 100644
--- a/tests/manual/viewinqwidget/viewinqwidget.pro
+++ b/tests/manual/viewinqwidget/viewinqwidget.pro
@@ -2,5 +2,5 @@ QT += qml quick widgets quickwidgets
 TARGET = viewinqwidget
 SOURCES += $$PWD/main.cpp
 OTHER_FILES += main.qml
-RESOURCES += viewinqwidget.qrc \
-    ../../../examples/controls/gallery/gallery.qrc
+RESOURCES += viewinqwidget.qrc
+DEFINES += SRCDIR=\\\"$$PWD/\\\"