Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7

Conflicts:
	demos/declarative/samegame/SamegameCore/samegame.js
	mkspecs/features/symbian/default_post.prf
	src/declarative/qml/qdeclarativeengine.cpp
	src/gui/text/qtextdocumentlayout.cpp
	src/plugins/plugins.pro
	src/s60installs/bwins/QtCoreu.def
	src/s60installs/bwins/QtGuiu.def
	src/s60installs/eabi/QtCoreu.def
	src/s60installs/eabi/QtGuiu.def
	src/s60installs/s60installs.pro
	tests/auto/declarative/declarative.pro
	tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp
	tests/auto/declarative/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp
	tests/auto/declarative/qmlvisual/qmlvisual.pro

3 files changed, 109 insertions, 53 deletions

diff --git a/tests/auto/declarative/qdeclarativeqt/data/formatting.qml b/tests/auto/declarative/qdeclarativeqt/data/formatting.qml
index 35c6a29..f520aeb 100644
--- a/tests/auto/declarative/qdeclarativeqt/data/formatting.qml
+++ b/tests/auto/declarative/qdeclarativeqt/data/formatting.qml
@@ -1,29 +1,44 @@
 import QtQuick 1.0
 
 QtObject {
-    property date date1: "2008-12-24"
-    property string test1: Qt.formatDate(date1)
-    property string test2: Qt.formatDate(date1, Qt.DefaultLocaleLongDate)
-    property string test3: Qt.formatDate(date1, "ddd MMMM d yy")
+    property date dateFromString: "2008-12-24"
+    property variant jsdate: new Date(2008,11,24,14,15,38,200) // months are 0-based
 
-    property variant time1: new Date(0,0,0,14,15,38,200)
-    property string test4: Qt.formatTime(time1)
-    property string test5: Qt.formatTime(time1, Qt.DefaultLocaleLongDate)
-    property string test6: Qt.formatTime(time1, "H:m:s a")
-    property string test7: Qt.formatTime(time1, "hh:mm:ss.zzz")
+    function formatDate(prop) {
+        var v = eval(prop)
+        return [
+            Qt.formatDate(v),
+            Qt.formatDate(v, Qt.DefaultLocaleLongDate),
+            Qt.formatDate(v, "ddd MMMM d yy")
+        ]
+    }
 
-    property variant dateTime1: new Date(1978,2,4,9,13,54)
-    property string test8: Qt.formatDateTime(dateTime1)
-    property string test9: Qt.formatDateTime(dateTime1, Qt.DefaultLocaleLongDate)
-    property string test10: Qt.formatDateTime(dateTime1, "M/d/yy H:m:s a")
+    function formatTime(prop) {
+        var v = eval(prop)
+        return [
+            Qt.formatTime(v),
+            Qt.formatTime(v, Qt.DefaultLocaleLongDate),
+            Qt.formatTime(v, "H:m:s a"),
+            Qt.formatTime(v, "hh:mm:ss.zzz")
+        ]
+    }
+
+    function formatDateTime(prop) {
+        var v = eval(prop)
+        return [
+            Qt.formatDateTime(v),
+            Qt.formatDateTime(v, Qt.DefaultLocaleLongDate),
+            Qt.formatDateTime(v, "M/d/yy H:m:s a")
+        ]
+    }
 
     // Error cases
-    property string test11: Qt.formatDate()
-    property string test12: Qt.formatDate(new Date, new Object)
+    property string err_date1: Qt.formatDate()
+    property string err_date2: Qt.formatDate(new Date, new Object)
 
-    property string test13: Qt.formatTime()
-    property string test14: Qt.formatTime(new Date, new Object)
+    property string err_time1: Qt.formatTime()
+    property string err_time2: Qt.formatTime(new Date, new Object)
 
-    property string test15: Qt.formatDateTime()
-    property string test16: Qt.formatDateTime(new Date, new Object)
+    property string err_dateTime1: Qt.formatDateTime()
+    property string err_dateTime2: Qt.formatDateTime(new Date, new Object)
 }
diff --git a/tests/auto/declarative/qdeclarativeqt/qdeclarativeqt.pro b/tests/auto/declarative/qdeclarativeqt/qdeclarativeqt.pro
index 71ff8a8..4b197eb 100644
--- a/tests/auto/declarative/qdeclarativeqt/qdeclarativeqt.pro
+++ b/tests/auto/declarative/qdeclarativeqt/qdeclarativeqt.pro
@@ -1,5 +1,5 @@
 load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative
+contains(QT_CONFIG,declarative): QT += declarative script
 SOURCES += tst_qdeclarativeqt.cpp
 macx:CONFIG -= app_bundle
 
diff --git a/tests/auto/declarative/qdeclarativeqt/tst_qdeclarativeqt.cpp b/tests/auto/declarative/qdeclarativeqt/tst_qdeclarativeqt.cpp
index bd9d01f..80d9d93 100644
--- a/tests/auto/declarative/qdeclarativeqt/tst_qdeclarativeqt.cpp
+++ b/tests/auto/declarative/qdeclarativeqt/tst_qdeclarativeqt.cpp
@@ -38,6 +38,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
+#include <private/qdeclarativeengine_p.h>
 
 #include <qtest.h>
 #include <QDebug>
@@ -81,7 +82,8 @@ private slots:
     void createComponent_pragmaLibrary();
     void createQmlObject();
     void consoleLog();
-    void formatting();
+    void dateTimeFormatting();
+    void dateTimeFormatting_data();
     void isQtObject();
     void btoa();
     void atob();
@@ -446,49 +448,88 @@ void tst_qdeclarativeqt::consoleLog()
     delete object;
 }
 
-void tst_qdeclarativeqt::formatting()
+void tst_qdeclarativeqt::dateTimeFormatting()
 {
-    QDeclarativeComponent component(&engine, TEST_FILE("formatting.qml"));
+    QFETCH(QString, method);
+    QFETCH(QStringList, inputProperties);
+    QFETCH(QStringList, expectedResults);
 
-    QString warning1 = component.url().toString() + ":22: Error: Qt.formatDate(): Invalid date format";
-    QString warning2 = component.url().toString() + ":21: Error: Qt.formatDate(): Invalid arguments";
-    QString warning3 = component.url().toString() + ":28: Error: Qt.formatDateTime(): Invalid datetime format";
-    QString warning4 = component.url().toString() + ":27: Error: Qt.formatDateTime(): Invalid arguments";
-    QString warning5 = component.url().toString() + ":25: Error: Qt.formatTime(): Invalid time format";
-    QString warning6 = component.url().toString() + ":24: Error: Qt.formatTime(): Invalid arguments";
+    QDate date(2008,12,24);
+    QTime time(14,15,38,200);
+    QDateTime dateTime(date, time);
 
-    QTest::ignoreMessage(QtWarningMsg, qPrintable(warning1));
-    QTest::ignoreMessage(QtWarningMsg, qPrintable(warning2));
-    QTest::ignoreMessage(QtWarningMsg, qPrintable(warning3));
-    QTest::ignoreMessage(QtWarningMsg, qPrintable(warning4));
-    QTest::ignoreMessage(QtWarningMsg, qPrintable(warning5));
-    QTest::ignoreMessage(QtWarningMsg, qPrintable(warning6));
+    QDeclarativeEngine eng;
+
+    eng.rootContext()->setContextProperty("qdate", date);
+    eng.rootContext()->setContextProperty("qtime", time);
+    eng.rootContext()->setContextProperty("qdatetime", dateTime);
+
+    QDeclarativeComponent component(&eng, TEST_FILE("formatting.qml"));
+
+    QStringList warnings;
+    warnings << component.url().toString() + ":37: Error: Qt.formatDate(): Invalid date format"
+        << component.url().toString() + ":36: Error: Qt.formatDate(): Invalid arguments"
+        << component.url().toString() + ":40: Error: Qt.formatTime(): Invalid time format"
+        << component.url().toString() + ":39: Error: Qt.formatTime(): Invalid arguments"
+        << component.url().toString() + ":43: Error: Qt.formatDateTime(): Invalid datetime format"
+        << component.url().toString() + ":42: Error: Qt.formatDateTime(): Invalid arguments";
+
+    foreach (const QString &warning, warnings)
+        QTest::ignoreMessage(QtWarningMsg, qPrintable(warning));
 
     QObject *object = component.create();
+    QVERIFY2(component.errorString().isEmpty(), qPrintable(component.errorString()));
     QVERIFY(object != 0);
 
-    QDate date1(2008,12,24);
-    QCOMPARE(object->property("date1").toDate(), date1);
-    QCOMPARE(object->property("test1").toString(), date1.toString(Qt::DefaultLocaleShortDate));
-    QCOMPARE(object->property("test2").toString(), date1.toString(Qt::DefaultLocaleLongDate));
-    QCOMPARE(object->property("test3").toString(), date1.toString("ddd MMMM d yy"));
-
-    QTime time1(14,15,38,200);
-    QCOMPARE(object->property("time1").toTime(), time1);
-    QCOMPARE(object->property("test4").toString(), time1.toString(Qt::DefaultLocaleShortDate));
-    QCOMPARE(object->property("test5").toString(), time1.toString(Qt::DefaultLocaleLongDate));
-    QCOMPARE(object->property("test6").toString(), time1.toString("H:m:s a"));
-    QCOMPARE(object->property("test7").toString(), time1.toString("hh:mm:ss.zzz"));
-
-    QDateTime dateTime1(QDate(1978,03,04),QTime(9,13,54));
-    QCOMPARE(object->property("dateTime1").toDateTime(),dateTime1);
-    QCOMPARE(object->property("test8").toString(), dateTime1.toString(Qt::DefaultLocaleShortDate));
-    QCOMPARE(object->property("test9").toString(), dateTime1.toString(Qt::DefaultLocaleLongDate));
-    QCOMPARE(object->property("test10").toString(), dateTime1.toString("M/d/yy H:m:s a"));
+    QVERIFY(inputProperties.count() > 0);
+
+    QVariant result;
+    foreach(const QString &prop, inputProperties) {
+        QVERIFY(QMetaObject::invokeMethod(object, method.toUtf8().constData(),
+                Q_RETURN_ARG(QVariant, result),
+                Q_ARG(QVariant, prop)));
+
+        QStringList output = result.toStringList();
+        for (int i=0; i<output.count(); i++)
+            QCOMPARE(output[i], expectedResults[i]);
+    }
 
     delete object;
 }
 
+void tst_qdeclarativeqt::dateTimeFormatting_data()
+{
+    QTest::addColumn<QString>("method");
+    QTest::addColumn<QStringList>("inputProperties");
+    QTest::addColumn<QStringList>("expectedResults");
+
+    QDate date(2008,12,24);
+    QTime time(14,15,38,200);
+    QDateTime dateTime(date, time);
+
+    QTest::newRow("formatDate")
+        << "formatDate"
+        << (QStringList() << "dateFromString" << "jsdate" << "qdate" << "qdatetime")
+        << (QStringList() << date.toString(Qt::DefaultLocaleShortDate)
+                          << date.toString(Qt::DefaultLocaleLongDate)
+                          << date.toString("ddd MMMM d yy"));
+
+    QTest::newRow("formatTime")
+        << "formatTime"
+        << (QStringList() << "jsdate" << "qtime" << "qdatetime")
+        << (QStringList() << time.toString(Qt::DefaultLocaleShortDate)
+                          << time.toString(Qt::DefaultLocaleLongDate)
+                          << time.toString("H:m:s a")
+                          << time.toString("hh:mm:ss.zzz"));
+
+    QTest::newRow("formatDateTime")
+        << "formatDateTime"
+        << (QStringList() << "jsdate" << "qdatetime")
+        << (QStringList() << dateTime.toString(Qt::DefaultLocaleShortDate)
+                          << dateTime.toString(Qt::DefaultLocaleLongDate)
+                          << dateTime.toString("M/d/yy H:m:s a"));
+}
+
 void tst_qdeclarativeqt::isQtObject()
 {
     QDeclarativeComponent component(&engine, TEST_FILE("isQtObject.qml"));