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

Change-Id: I4ea2b77cc201daed94fbe321f146dfd20365a534

1 files changed, 8 insertions, 0 deletions

diff --git a/tests/auto/corelib/io/qfileselector/tst_qfileselector.cpp b/tests/auto/corelib/io/qfileselector/tst_qfileselector.cpp
index b98a98df9c..bac7a69e0f 100644
--- a/tests/auto/corelib/io/qfileselector/tst_qfileselector.cpp
+++ b/tests/auto/corelib/io/qfileselector/tst_qfileselector.cpp
@@ -197,15 +197,23 @@ void tst_QFileSelector::urlConvenience_data()
 
     QString test("/test");// '/' is here so dir string can also be selector string
     QString custom1("custom1");
+    QString testWithQueryAndFragment("/test?query#Fragment");
 
     QTest::newRow("qrc") << QUrl("qrc:///extras/test") << (QStringList() << custom1)
         << QUrl(QString("qrc:///extras/") + QLatin1Char(selectorIndicator) + custom1 + test);
+    QTest::newRow("qrc with query and fragment") << QUrl(QString::fromLatin1("qrc:///extras%1").arg(testWithQueryAndFragment)) << (QStringList() << custom1)
+        << QUrl(QString("qrc:///extras/") + QLatin1Char(selectorIndicator) + custom1 + testWithQueryAndFragment);
 
     QString fileBasePath = QFINDTESTDATA("extras/test");
     QString fileSelectedPath = QFINDTESTDATA(QString("extras/") + QLatin1Char(selectorIndicator)
             + custom1 + QString("/test"));
     QTest::newRow("file") << QUrl::fromLocalFile(fileBasePath) << (QStringList() << custom1)
         << QUrl::fromLocalFile(fileSelectedPath);
+    // do not strip off the query and fragment
+    QString strUrlWithFragment = QString("file://") + testWithQueryAndFragment;
+    QTest::newRow("file with query and fragment") << QUrl(strUrlWithFragment) << (QStringList()) << QUrl(strUrlWithFragment);
+    strUrlWithFragment = QString("file:") + testWithQueryAndFragment;
+    QTest::newRow("file with query and fragment too") << QUrl(strUrlWithFragment) << (QStringList()) << QUrl(strUrlWithFragment);
 
     // http://qt-project.org/images/qtdn/sprites-combined-latest.png is chosen as a representative real world URL
     // But note that this test is checking that http urls are NOT selected so it shouldn't be checked