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

Conflicts:
	config.tests/glibc/glibc.cpp
	src/3rdparty
	src/core/configure.json
	src/core/profile_io_data_qt.cpp
	src/webengine/configure.json
	src/webenginewidgets/api/qwebenginepage.cpp
	tests/auto/widgets/qwebenginepage/BLACKLIST

Change-Id: I3e1781048c3cb09bfbf7427dfc5dd1fec11a2b97

1 files changed, 87 insertions, 29 deletions

diff --git a/tests/auto/quick/qmltests/data/tst_filePicker.qml b/tests/auto/quick/qmltests/data/tst_filePicker.qml
index 2f813b966..fad81273c 100644
--- a/tests/auto/quick/qmltests/data/tst_filePicker.qml
+++ b/tests/auto/quick/qmltests/data/tst_filePicker.qml
@@ -36,6 +36,12 @@ TestWebEngineView {
     width: 400
     height: 300
 
+    function driveLetter() {
+        if (Qt.platform.os !== "windows")
+            return "";
+        return "C:/";
+    }
+
     SignalSpy {
         id: titleSpy
         target: webEngineView
@@ -72,27 +78,25 @@ TestWebEngineView {
 
         function test_acceptSingleFileSelection_data() {
             return [
-                   { tag: "/test.txt)", input: "/test.txt", passDefaultDialog: false, passCustomDialog: true },
-                   { tag: "/tést.txt", input: "/tést.txt", passDefaultDialog: false, passCustomDialog: true },
-                   { tag: "file:///test.txt", input: "file:///test.txt", passDefaultDialog: true, passCustomDialog: false },
-                   { tag: "file:///tést.txt", input: "file:///tést.txt", passDefaultDialog: true, passCustomDialog: false  },
-                   { tag: "file:///t%C3%A9st.txt", input: "file:///t%C3%A9st.txt", passDefaultDialog: true, passCustomDialog: false },
-                   { tag: "file://test.txt", input: "file://test.txt", passDefaultDialog: false, passCustomDialog: false },
-                   { tag: "file:/test.txt", input: "file:/test.txt", passDefaultDialog: true, passCustomDialog: false },
-                   { tag: "file:test//test.txt", input: "file:test//test.txt", passDefaultDialog: false, passCustomDialog: false },
-                   { tag: "http://test.txt", input: "http://test.txt", passDefaultDialog: false, passCustomDialog: false },
-                   { tag: "qrc:/test.txt", input: "qrc:/test.txt", passDefaultDialog: false, passCustomDialog: false },
+                   { tag: driveLetter() + "/test.txt", input: driveLetter() + "/test.txt", expected: "test.txt" },
+                   { tag: driveLetter() + "test.txt", input: driveLetter() + "test.txt", expected: "Failed to Upload" },
+                   { tag: driveLetter() + "/tést.txt", input: driveLetter() + "/tést.txt", expected: "tést.txt" },
+                   { tag: driveLetter() + "/t%65st.txt", input: driveLetter() + "/t%65st.txt", expected: "t%65st.txt" },
+                   { tag: "file:///" + driveLetter() + "test.txt", input: "file:///" + driveLetter() + "test.txt", expected: "test.txt" },
+                   { tag: "file:///" + driveLetter() + "tést.txt", input: "file:///" + driveLetter() + "tést.txt", expected: "tést.txt" },
+                   { tag: "file:///" + driveLetter() + "t%65st.txt", input: "file:///" + driveLetter() + "t%65st.txt", expected: "test.txt" },
+                   { tag: "file://" + driveLetter() + "test.txt", input: "file://" + driveLetter() + "test.txt", expected: "test.txt" },
+                   { tag: "file:/" + driveLetter() + "test.txt", input: "file:/" + driveLetter() + "test.txt", expected: "test.txt"},
+                   { tag: "file:test//test.txt", input: "file:test//test.txt", expected: "Failed to Upload" },
+                   { tag: "http://test.txt", input: "http://test.txt", expected: "Failed to Upload" },
+                   { tag: "qrc:/test.txt", input: "qrc:/test.txt", expected: "Failed to Upload" },
             ];
         }
 
         function test_acceptSingleFileSelection(row) {
             var expectedFileName;
 
-            // Default dialog (expects URL).
-            expectedFileName = "Failed to Upload";
-            if (row.passDefaultDialog)
-                expectedFileName = row.input.slice(row.input.lastIndexOf('/') + 1);
-
+            // Default dialog
             webEngineView.url = Qt.resolvedUrl("singlefileupload.html");
             verify(webEngineView.waitForLoadSucceeded());
 
@@ -101,16 +105,12 @@ TestWebEngineView {
 
             keyClick(Qt.Key_Enter); // Focus is on the button. Open FileDialog.
             tryCompare(FilePickerParams, "filePickerOpened", true);
-            tryCompare(webEngineView, "title", decodeURIComponent(expectedFileName));
+            tryCompare(webEngineView, "title", row.expected);
 
 
-            // Custom dialog (expects absolute path).
+            // Custom dialog
             var finished = false;
 
-            expectedFileName = "Failed to Upload";
-            if (row.passCustomDialog)
-                expectedFileName = row.input.slice(row.input.lastIndexOf('/') + 1);
-
             function acceptedFileHandler(request) {
                 request.accepted = true;
                 request.dialogAccept(row.input);
@@ -123,7 +123,7 @@ TestWebEngineView {
 
             keyClick(Qt.Key_Enter); // Focus is on the button. Open FileDialog.
             tryVerify(function() { return finished; });
-            tryCompare(webEngineView, "title", expectedFileName);
+            tryCompare(webEngineView, "title", row.expected);
             webEngineView.fileDialogRequested.disconnect(acceptedFileHandler);
         }
 
@@ -165,14 +165,14 @@ TestWebEngineView {
 
         function test_acceptMultipleFilesWithCustomDialog_data() {
             return [
-                   { tag: "path", input: ["/test1.txt", "/test2.txt"], expectedValueForDefaultDialog: "Failed to Upload", expectedValueForCustomDialog: "test1.txt,test2.txt" },
-                   { tag: "file", input: ["file:///test1.txt", "file:///test2.txt"], expectedValueForDefaultDialog: "test1.txt,test2.txt", expectedValueForCustomDialog: "Failed to Upload" },
-                   { tag: "mixed", input: ["file:///test1.txt", "/test2.txt"], expectedValueForDefaultDialog: "test1.txt", expectedValueForCustomDialog: "test2.txt" },
+                   { tag: "path", input: [driveLetter() + "/test1.txt", driveLetter() + "/test2.txt"], expectedValue: "test1.txt,test2.txt" },
+                   { tag: "file", input: ["file:///" + driveLetter() + "test1.txt", "file:/" + driveLetter() + "test2.txt"], expectedValue: "test1.txt,test2.txt" },
+                   { tag: "mixed", input: ["file:///" + driveLetter() + "test1.txt", driveLetter() + "/test2.txt"], expectedValue: "test1.txt,test2.txt" },
             ];
         }
 
         function test_acceptMultipleFilesWithCustomDialog(row) {
-            // Default dialog (expects URL).
+            // Default dialog
             webEngineView.url = Qt.resolvedUrl("multifileupload.html");
             verify(webEngineView.waitForLoadSucceeded());
 
@@ -181,10 +181,10 @@ TestWebEngineView {
 
             keyClick(Qt.Key_Enter); // Focus is on the button. Open FileDialog.
             tryCompare(FilePickerParams, "filePickerOpened", true);
-            tryCompare(webEngineView, "title", row.expectedValueForDefaultDialog);
+            tryCompare(webEngineView, "title", row.expectedValue);
 
 
-            // Custom dialog (expects absolute path).
+            // Custom dialog
             var finished = false;
 
             function acceptedFileHandler(request) {
@@ -199,7 +199,65 @@ TestWebEngineView {
 
             keyClick(Qt.Key_Enter); // Focus is on the button. Open FileDialog.
             tryVerify(function() { return finished; });
-            tryCompare(webEngineView, "title", row.expectedValueForCustomDialog);
+            tryCompare(webEngineView, "title", row.expectedValue);
+            webEngineView.fileDialogRequested.disconnect(acceptedFileHandler);
+        }
+
+        function test_acceptFileOnWindows_data() {
+            return [
+                   { tag: "C:test.txt", input: "C:test.txt", expected: "Failed to Upload"},
+                   { tag: "C:test:txt", input: "C:test:txt", expected: "Failed to Upload"},
+                   { tag: "C:/test.txt", input: "C:/test.txt", expected: "test.txt"},
+                   { tag: "C:\\test.txt", input: "C:\\test.txt", expected: "test.txt"},
+                   { tag: "C:\\Documents and Settings\\test\\test.txt", input: "C:\\Documents and Settings\\test\\test.txt", expected: "test.txt"},
+                   { tag: "\\\\applib\\products\\a%2Db\\ abc%5F9\\t.est\\test.txt", input: "file://applib/products/a%2Db/ abc%5F9/4148.920a/media/test.txt", expected: "test.txt"},
+                   { tag: "file://applib/products/a%2Db/ abc%5F9/t.est/test.txt", input: "file://applib/products/a%2Db/ abc%5F9/4148.920a/media/test.txt", expected: "test.txt"},
+                   { tag: "file://applib/products/a-b/abc_1/t.est/test.txt", input: "file://applib/products/a-b/abc_1/t.est/test.txt", expected: "test.txt"},
+                   { tag: "file:\\\\applib\\products\\a-b\\abc_1\\t:est\\test.txt", input: "file:\\\\applib\\products\\a-b\\abc_1\\t:est\\test.txt", expected: "test.txt"},
+                   { tag: "file:C:/test.txt", input: "file:C:/test.txt", expected: "Failed to Upload"},
+                   { tag: "file:/C:/test.txt", input: "file:/C:/test.txt", expected: "Failed to Upload"},
+                   { tag: "file://C:/test.txt", input: "file://C:/test.txt", expected: "Failed to Upload"},
+                   { tag: "file:///C:test.txt", input: "file:///C:test.txt", expected: "Failed to Upload"},
+                   { tag: "file:///C:/test.txt", input: "file:///C:/test.txt", expected: "test.txt"},
+                   { tag: "file:///C:\\test.txt", input: "file:///C:\\test.txt", expected: "test.txt"},
+                   { tag: "file:\\//C:/test.txt", input: "file:\\//C:/test.txt", expected: "test.txt"},
+                   { tag: "file:\\\\/C:\\test.txt", input: "file:\\\\/C:\\test.txt", expected: "test.txt"},
+                   { tag: "\\\\?\\C:/test.txt", input: "\\\\?\\C:/test.txt", expected: "Failed to Upload"},
+            ];
+        }
+
+        function test_acceptFileOnWindows(row) {
+            if (Qt.platform.os !== "windows")
+                skip("Windows-only test");
+
+            // Default dialog
+            webEngineView.url = Qt.resolvedUrl("singlefileupload.html");
+            verify(webEngineView.waitForLoadSucceeded());
+
+            FilePickerParams.selectFiles = true;
+            FilePickerParams.selectedFilesUrl.push(row.input);
+
+            keyClick(Qt.Key_Enter); // Focus is on the button. Open FileDialog.
+            tryCompare(FilePickerParams, "filePickerOpened", true);
+            tryCompare(webEngineView, "title", row.expected);
+
+
+            // Custom dialog
+            var finished = false;
+
+            function acceptedFileHandler(request) {
+                request.accepted = true;
+                request.dialogAccept(row.input);
+                finished = true;
+            }
+
+            webEngineView.fileDialogRequested.connect(acceptedFileHandler);
+            webEngineView.url = Qt.resolvedUrl("singlefileupload.html");
+            verify(webEngineView.waitForLoadSucceeded());
+
+            keyClick(Qt.Key_Enter); // Focus is on the button. Open FileDialog.
+            tryVerify(function() { return finished; });
+            tryCompare(webEngineView, "title", row.expected);
             webEngineView.fileDialogRequested.disconnect(acceptedFileHandler);
         }
     }