3 files changed, 21 insertions, 8 deletions
diff --git a/tests/auto/corelib/tools/qcommandlineparser/tst_qcommandlineparser.cpp b/tests/auto/corelib/tools/qcommandlineparser/tst_qcommandlineparser.cpp
index cbbb30a598..ce30710f7f 100644
--- a/tests/auto/corelib/tools/qcommandlineparser/tst_qcommandlineparser.cpp
+++ b/tests/auto/corelib/tools/qcommandlineparser/tst_qcommandlineparser.cpp
@@ -572,15 +572,16 @@ void tst_QCommandLineParser::testQuoteEscaping()
     QProcess process;
     process.start("testhelper/qcommandlineparser_test_helper", QStringList() <<
             QString::number(QCommandLineParser::ParseAsCompactedShortOptions) <<
-            "-DKEY1=\"VALUE1\"" << "-DKEY2=\\\"VALUE2\\\"" <<
+            "\\\\server\\path" <<
+            "-DKEY1=\"VALUE1\""
             "-DQTBUG-15379=C:\\path\\'file.ext" <<
             "-DQTBUG-30628=C:\\temp\\'file'.ext");
     QVERIFY(process.waitForFinished(5000));
     QCOMPARE(process.exitStatus(), QProcess::NormalExit);
     QString output = process.readAll();
     QVERIFY2(!output.contains("ERROR"), qPrintable(output));
+    QVERIFY2(output.contains("\\\\server\\path"), qPrintable(output));
     QVERIFY2(output.contains("KEY1=\"VALUE1\""), qPrintable(output));
-    QVERIFY2(output.contains("KEY2=\\\"VALUE2\\\""), qPrintable(output));
     QVERIFY2(output.contains("QTBUG-15379=C:\\path\\'file.ext"), qPrintable(output));
     QVERIFY2(output.contains("QTBUG-30628=C:\\temp\\'file'.ext"), qPrintable(output));
 #endif // !QT_NO_PROCESS
diff --git a/tests/auto/corelib/tools/qdate/tst_qdate.cpp b/tests/auto/corelib/tools/qdate/tst_qdate.cpp
index 728a4244a1..b91de092e8 100644
--- a/tests/auto/corelib/tools/qdate/tst_qdate.cpp
+++ b/tests/auto/corelib/tools/qdate/tst_qdate.cpp
@@ -1137,10 +1137,14 @@ void tst_QDate::toStringDateFormat()
     QFETCH(QString, expectedStr);
 
     QCOMPARE(date.toString(Qt::SystemLocaleShortDate), QLocale::system().toString(date, QLocale::ShortFormat));
-    QCOMPARE(date.toString(Qt::LocaleDate), QLocale().toString(date, QLocale::ShortFormat));
+    QCOMPARE(date.toString(Qt::DefaultLocaleShortDate), QLocale().toString(date, QLocale::ShortFormat));
+    QCOMPARE(date.toString(Qt::SystemLocaleLongDate), QLocale::system().toString(date, QLocale::LongFormat));
+    QCOMPARE(date.toString(Qt::DefaultLocaleLongDate), QLocale().toString(date, QLocale::LongFormat));
     QLocale::setDefault(QLocale::German);
     QCOMPARE(date.toString(Qt::SystemLocaleShortDate), QLocale::system().toString(date, QLocale::ShortFormat));
-    QCOMPARE(date.toString(Qt::LocaleDate), QLocale().toString(date, QLocale::ShortFormat));
+    QCOMPARE(date.toString(Qt::DefaultLocaleShortDate), QLocale().toString(date, QLocale::ShortFormat));
+    QCOMPARE(date.toString(Qt::SystemLocaleLongDate), QLocale::system().toString(date, QLocale::LongFormat));
+    QCOMPARE(date.toString(Qt::DefaultLocaleLongDate), QLocale().toString(date, QLocale::LongFormat));
 
     QCOMPARE(date.toString(format), expectedStr);
 }
diff --git a/tests/auto/corelib/tools/qtime/tst_qtime.cpp b/tests/auto/corelib/tools/qtime/tst_qtime.cpp
index 0563111abb..4bd29da056 100644
--- a/tests/auto/corelib/tools/qtime/tst_qtime.cpp
+++ b/tests/auto/corelib/tools/qtime/tst_qtime.cpp
@@ -723,15 +723,23 @@ void tst_QTime::toStringFormat()
 void tst_QTime::toStringLocale()
 {
     QTime time(18, 30);
-    QCOMPARE(time.toString(Qt::SystemLocaleDate),
+    QCOMPARE(time.toString(Qt::SystemLocaleShortDate),
                 QLocale::system().toString(time, QLocale::ShortFormat));
-    QCOMPARE(time.toString(Qt::LocaleDate),
+    QCOMPARE(time.toString(Qt::DefaultLocaleShortDate),
                 QLocale().toString(time, QLocale::ShortFormat));
+    QCOMPARE(time.toString(Qt::SystemLocaleLongDate),
+                QLocale::system().toString(time, QLocale::LongFormat));
+    QCOMPARE(time.toString(Qt::DefaultLocaleLongDate),
+                QLocale().toString(time, QLocale::LongFormat));
     QLocale::setDefault(QLocale::German);
-    QCOMPARE(time.toString(Qt::SystemLocaleDate),
+    QCOMPARE(time.toString(Qt::SystemLocaleShortDate),
                 QLocale::system().toString(time, QLocale::ShortFormat));
-    QCOMPARE(time.toString(Qt::LocaleDate),
+    QCOMPARE(time.toString(Qt::DefaultLocaleShortDate),
                 QLocale().toString(time, QLocale::ShortFormat));
+    QCOMPARE(time.toString(Qt::SystemLocaleLongDate),
+                QLocale::system().toString(time, QLocale::LongFormat));
+    QCOMPARE(time.toString(Qt::DefaultLocaleLongDate),
+                QLocale().toString(time, QLocale::LongFormat));
 }
 
 void tst_QTime::msecsSinceStartOfDay_data()