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

Conflicts:
	bin/syncqt
	demos/declarative/snake/content/snake.js
	demos/declarative/snake/snake.qml
	doc/src/development/qmake-manual.qdoc
	src/corelib/plugin/plugin.pri
	src/gui/kernel/qapplication_win.cpp
	src/gui/kernel/qdesktopwidget_win.cpp
	src/gui/painting/qdrawhelper.cpp
	tests/auto/qdir/tst_qdir.cpp
	tools/qdoc3/test/assistant.qdocconf
	tools/qdoc3/test/designer.qdocconf
	tools/qdoc3/test/linguist.qdocconf

1 files changed, 66 insertions, 0 deletions

diff --git a/tests/auto/qscriptengine/tst_qscriptengine.cpp b/tests/auto/qscriptengine/tst_qscriptengine.cpp
index 6def23e..b035492 100644
--- a/tests/auto/qscriptengine/tst_qscriptengine.cpp
+++ b/tests/auto/qscriptengine/tst_qscriptengine.cpp
@@ -174,6 +174,10 @@ private slots:
     void reentrency();
     void newFixedStaticScopeObject();
     void newGrowingStaticScopeObject();
+    void dateRoundtripJSQtJS();
+    void dateRoundtripQtJSQt();
+    void dateConversionJSQt();
+    void dateConversionQtJS();
 };
 
 tst_QScriptEngine::tst_QScriptEngine()
@@ -5067,6 +5071,68 @@ void tst_QScriptEngine::qRegExpInport()
     }
 }
 
+// QScriptValue::toDateTime() returns a local time, whereas JS dates
+// are always stored as UTC. QtScript must respect the current time
+// zone, and correctly adjust for daylight saving time that may be in
+// effect at a given date (QTBUG-9770).
+void tst_QScriptEngine::dateRoundtripJSQtJS()
+{
+    uint secs = QDateTime(QDate(2009, 1, 1)).toUTC().toTime_t();
+    QScriptEngine eng;
+    for (int i = 0; i < 8000; ++i) {
+        QScriptValue jsDate = eng.evaluate(QString::fromLatin1("new Date(%0)").arg(secs * 1000.0));
+        QDateTime qtDate = jsDate.toDateTime();
+        QScriptValue jsDate2 = eng.newDate(qtDate);
+        if (jsDate2.toNumber() != jsDate.toNumber())
+            QFAIL(qPrintable(jsDate.toString()));
+        secs += 2*60*60;
+    }
+}
+
+void tst_QScriptEngine::dateRoundtripQtJSQt()
+{
+    QDateTime qtDate = QDateTime(QDate(2009, 1, 1));
+    QScriptEngine eng;
+    for (int i = 0; i < 8000; ++i) {
+        QScriptValue jsDate = eng.newDate(qtDate);
+        QDateTime qtDate2 = jsDate.toDateTime();
+        if (qtDate2 != qtDate)
+            QFAIL(qPrintable(qtDate.toString()));
+        qtDate = qtDate.addSecs(2*60*60);
+    }
+}
+
+void tst_QScriptEngine::dateConversionJSQt()
+{
+    uint secs = QDateTime(QDate(2009, 1, 1)).toUTC().toTime_t();
+    QScriptEngine eng;
+    for (int i = 0; i < 8000; ++i) {
+        QScriptValue jsDate = eng.evaluate(QString::fromLatin1("new Date(%0)").arg(secs * 1000.0));
+        QDateTime qtDate = jsDate.toDateTime();
+        QString qtUTCDateStr = qtDate.toUTC().toString(Qt::ISODate);
+        QString jsUTCDateStr = jsDate.property("toISOString").call(jsDate).toString();
+        jsUTCDateStr.chop(5); // get rid of milliseconds (".000Z")
+        if (qtUTCDateStr != jsUTCDateStr)
+            QFAIL(qPrintable(jsDate.toString()));
+        secs += 2*60*60;
+    }
+}
+
+void tst_QScriptEngine::dateConversionQtJS()
+{
+    QDateTime qtDate = QDateTime(QDate(2009, 1, 1));
+    QScriptEngine eng;
+    for (int i = 0; i < 8000; ++i) {
+        QScriptValue jsDate = eng.newDate(qtDate);
+        QString jsUTCDateStr = jsDate.property("toISOString").call(jsDate).toString();
+        jsUTCDateStr.chop(5); // get rid of milliseconds (".000Z")
+        QString qtUTCDateStr = qtDate.toUTC().toString(Qt::ISODate);
+        if (jsUTCDateStr != qtUTCDateStr)
+            QFAIL(qPrintable(qtDate.toString()));
+        qtDate = qtDate.addSecs(2*60*60);
+    }
+}
+
 static QScriptValue createAnotherEngine(QScriptContext *, QScriptEngine *)
 {
     QScriptEngine eng;