Fix remaining QQmlLocale auto-test failures

Thanks to improvements in QDateTime's parser, we can unskip a bunch of tests.
What remained was dateFromLocaleTimeString, which failed because it relied on
the earlier behavior of a failed conversion from a _time_ string to a date
also returning an invalid date object. This behavior is restored by leaving
the QDateTime object as invalid unless the converted time is valid.

In Qt <= 5.1, QDateTime::setTime would make the entire datetime object invalid
if the provided time was invalid. In Qt >= 5.2 it remains potentially valid
if the date at least is correct - which was the case here as it was initialized
from currentDateTime.

Change-Id: I32a2cd2a9631cca3b12773e4c55169baa3eeaf1a
Reviewed-by: Lars Knoll <lars.knoll@digia.com>

1 files changed, 5 insertions, 2 deletions

diff --git a/src/qml/qml/qqmllocale.cpp b/src/qml/qml/qqmllocale.cpp
index fc9e2fc42a..178280b27c 100644
--- a/src/qml/qml/qqmllocale.cpp
+++ b/src/qml/qml/qqmllocale.cpp
@@ -290,8 +290,11 @@ QV4::ReturnedValue QQmlDateExtension::method_fromLocaleTimeString(QV4::CallConte
         tm = r->locale.toTime(dateString, enumFormat);
     }
 
-    QDateTime dt = QDateTime::currentDateTime();
-    dt.setTime(tm);
+    QDateTime dt;
+    if (tm.isValid()) {
+        dt = QDateTime::currentDateTime();
+        dt.setTime(tm);
+    }
 
     return QV4::Encode(engine->newDateObject(dt));
 }