Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-public

2 files changed, 8 insertions, 8 deletions

diff --git a/qmake/generators/symbian/initprojectdeploy_symbian.cpp b/qmake/generators/symbian/initprojectdeploy_symbian.cpp
index e0e19b1..23b2c50 100644
--- a/qmake/generators/symbian/initprojectdeploy_symbian.cpp
+++ b/qmake/generators/symbian/initprojectdeploy_symbian.cpp
@@ -58,7 +58,7 @@ static void createPluginStub(const QFileInfo& info,
         // Add note to stub so that people will not wonder what it is.
         // Creation date is added to make new stub to deploy always to
         // force plugin cache miss when loading plugins.
-        t << "This file is a Qt plugin stub file. The real Qt plugin is located in \\sys\\bin. Created:" << QDateTime::currentDateTime().toString() << "\n";
+        t << "This file is a Qt plugin stub file. The real Qt plugin is located in \\sys\\bin. Created:" << QDateTime::currentDateTime().toString(Qt::ISODate) << "\n";
     } else {
         fprintf(stderr, "cannot deploy \"%s\" because of plugin stub file creation failed\n", info.fileName().toLatin1().constData());
     }
diff --git a/qmake/generators/symbian/symmake.cpp b/qmake/generators/symbian/symmake.cpp
index 06e761a..69d09ac 100644
--- a/qmake/generators/symbian/symmake.cpp
+++ b/qmake/generators/symbian/symmake.cpp
@@ -123,7 +123,7 @@ void SymbianMakefileGenerator::writeHeader(QTextStream &t) {
     t << "// ============================================================================" << endl;
     t << "// * Makefile for building: " << escapeFilePath(var("TARGET")) << endl;
     t << "// * Generated by qmake (" << qmake_version() << ") (Qt " << QT_VERSION_STR << ") on: ";
-    t << QDateTime::currentDateTime().toString() << endl;
+    t << QDateTime::currentDateTime().toString(Qt::ISODate) << endl;
     t << "// * This file is generated by qmake and should not be modified by the" << endl;
     t << "// * user." << endl;
     t << "// * Project:  " << fileFixify(project->projectFile()) << endl;
@@ -255,7 +255,7 @@ bool SymbianMakefileGenerator::generatePkgFile(const QString &compiler, const QS
 
     //   header info
     QTextStream t(&pkgFile);
-    t << QString("; %1 generated by qmake at %2").arg(pkgFilename).arg(QDateTime::currentDateTime().toString())  << endl;
+    t << QString("; %1 generated by qmake at %2").arg(pkgFilename).arg(QDateTime::currentDateTime().toString(Qt::ISODate))  << endl;
     t << "; This file is generated by qmake and should not be modified by the user" << endl;
     t << ";" << endl << endl;
 
@@ -365,7 +365,7 @@ bool SymbianMakefileGenerator::writeCustomDefFile() {
 
             t << "; ==============================================================================" << endl;
             t << "; Generated by qmake (" << qmake_version() << ") (Qt " << QT_VERSION_STR << ") on: ";
-            t << QDateTime::currentDateTime().toString() << endl;
+            t << QDateTime::currentDateTime().toString(Qt::ISODate) << endl;
             t << "; This file is generated by qmake and should not be modified by the" << endl;
             t << "; user." << endl;
             t << ";  Name        : " PLUGIN_COMMON_DEF_FILE_ACTUAL << endl;
@@ -614,7 +614,7 @@ bool SymbianMakefileGenerator::removeDuplicatedStrings(QStringList& stringList)
 bool SymbianMakefileGenerator::writeMmpFileHeader(QTextStream &t){
     t << "// ==============================================================================" << endl;
     t << "// Generated by qmake (" << qmake_version() << ") (Qt " << QT_VERSION_STR << ") on: ";
-    t << QDateTime::currentDateTime().toString() << endl;
+    t << QDateTime::currentDateTime().toString(Qt::ISODate) << endl;
     t << "// This file is generated by qmake and should not be modified by the" << endl;
     t << "// user." << endl;
     t << "//  Name        : " << escapeFilePath(fileFixify(project->projectFile().remove(project->projectFile().length()-4,4))) << ".mmp" << endl;
@@ -1129,7 +1129,7 @@ bool SymbianMakefileGenerator::writeRegRssFile(QString &appName, QStringList &us
 		QTextStream t(&ft);
         t << "// ============================================================================" << endl;
         t << "// * Generated by qmake (" << qmake_version() << ") (Qt " << QT_VERSION_STR << ") on: ";
-        t << QDateTime::currentDateTime().toString() << endl;
+        t << QDateTime::currentDateTime().toString(Qt::ISODate) << endl;
         t << "// * This file is generated by qmake and should not be modified by the" << endl;
         t << "// * user." << endl;
         t << "// ============================================================================" << endl;
@@ -1164,7 +1164,7 @@ bool SymbianMakefileGenerator::writeRssFile(QString &appName, QString &numberOfI
 		QTextStream t(&ft);
         t << "// ============================================================================" << endl;
         t << "// * Generated by qmake (" << qmake_version() << ") (Qt " << QT_VERSION_STR << ") on: ";
-        t << QDateTime::currentDateTime().toString() << endl;
+        t << QDateTime::currentDateTime().toString(Qt::ISODate) << endl;
         t << "// * This file is generated by qmake and should not be modified by the" << endl;
         t << "// * user." << endl;
         t << "// ============================================================================" << endl;
@@ -1208,7 +1208,7 @@ bool SymbianMakefileGenerator::writeLocFile(QString &appName, QStringList &symbi
 		QTextStream t(&ft);
         t << "// ============================================================================" << endl;
         t << "// * Generated by qmake (" << qmake_version() << ") (Qt " << QT_VERSION_STR << ") on: ";
-        t << QDateTime::currentDateTime().toString() << endl;
+        t << QDateTime::currentDateTime().toString(Qt::ISODate) << endl;
         t << "// * This file is generated by qmake and should not be modified by the" << endl;
         t << "// * user." << endl;
         t << "// ============================================================================" << endl;