Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Fix a coding style issue in a generated code in the QScriptValue tests.
  Fix Mac-specific tests about the hidden
  QScriptValue autotest generator modification.
  Fix the hidden status check for a file on
  Fix for root path issue in tst_qdir. (case "drive:")
  Fix tst_qdir to use const char* instead of QString for QTest::newRow
  Fix for qfsfileengine_win to return proper absolute path for C:\

5 files changed, 142 insertions, 46 deletions

diff --git a/src/corelib/io/qfsfileengine_unix.cpp b/src/corelib/io/qfsfileengine_unix.cpp
index 5762d94..569801a 100644
--- a/src/corelib/io/qfsfileengine_unix.cpp
+++ b/src/corelib/io/qfsfileengine_unix.cpp
@@ -890,6 +890,9 @@ QAbstractFileEngine::FileFlags QFSFileEngine::fileFlags(FileFlags type) const
             if ((baseName.size() > 0 && baseName.at(0) == QLatin1Char('.'))
 #  if !defined(QWS) && defined(Q_OS_MAC)
                 || _q_isMacHidden(d->filePath)
+#   if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
+		|| d->st.st_flags & UF_HIDDEN
+#   endif // MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
 #  endif
             ) {
                 ret |= HiddenFlag;
diff --git a/src/corelib/io/qfsfileengine_win.cpp b/src/corelib/io/qfsfileengine_win.cpp
index cc9b8c7..254c03e 100644
--- a/src/corelib/io/qfsfileengine_win.cpp
+++ b/src/corelib/io/qfsfileengine_win.cpp
@@ -1664,10 +1664,12 @@ QString QFSFileEngine::fileName(FileName file) const
 
         if (!isRelativePath()) {
 #if !defined(Q_OS_WINCE)
-            if ((d->filePath.size() > 2 && d->filePath.at(1) == QLatin1Char(':')
-                && d->filePath.at(2) != QLatin1Char('/')) || // It's a drive-relative path, so Z:a.txt -> Z:\currentpath\a.txt
-                d->filePath.startsWith(QLatin1Char('/'))    // It's a absolute path to the current drive, so \a.txt -> Z:\a.txt
-                ) {
+            if (d->filePath.startsWith(QLatin1Char('/')) || // It's a absolute path to the current drive, so \a.txt -> Z:\a.txt
+                d->filePath.size() == 2 ||                  // It's a drive letter that needs to get a working dir appended
+                (d->filePath.size() > 2 && d->filePath.at(2) != QLatin1Char('/')) || // It's a drive-relative path, so Z:a.txt -> Z:\currentpath\a.txt
+                d->filePath.contains(QLatin1String("/../")) || d->filePath.contains(QLatin1String("/./")) ||
+                d->filePath.endsWith(QLatin1String("/..")) || d->filePath.endsWith(QLatin1String("/.")))
+            {
                 ret = QDir::fromNativeSeparators(nativeAbsoluteFilePath(d->filePath));
             } else {
                 ret = d->filePath;
diff --git a/tests/auto/qdir/tst_qdir.cpp b/tests/auto/qdir/tst_qdir.cpp
index 71469bb..661a4c7 100644
--- a/tests/auto/qdir/tst_qdir.cpp
+++ b/tests/auto/qdir/tst_qdir.cpp
@@ -172,6 +172,11 @@ private slots:
     void longFileName();
 
     void updateFileLists();
+
+#if defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN)
+    void isRoot_data();
+    void isRoot();
+#endif
 };
 
 // Testing get/set functions
@@ -805,6 +810,16 @@ void tst_QDir::canonicalPath_data()
     QTest::newRow("absPath") << appPath + "\\testData\\..\\testData" << appPath + "/testData";
 #endif
     QTest::newRow("nonexistant") << "testd" << QString();
+
+#if defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN)
+    QTest::newRow("drive:/") << QDir::rootPath() << QDir::rootPath();
+    QTest::newRow("drive:\\") << QDir::toNativeSeparators(QDir::rootPath()) << QDir::rootPath();
+    QTest::newRow("drive:/./") << QDir::rootPath().append("./") << QDir::rootPath();
+    QTest::newRow("drive:/../.. ") << QDir::rootPath().append("../..") << QDir::rootPath();
+    QTest::newRow("drive:\\.\\") << QDir::toNativeSeparators(QDir::rootPath().append("./")) << QDir::rootPath();
+    QTest::newRow("drive:\\..\\..") << QDir::toNativeSeparators(QDir::rootPath().append("../..")) << QDir::rootPath();
+    QTest::newRow("drive:") << QDir().canonicalPath().left(2) << QDir().canonicalPath();
+#endif
 }
 
 void tst_QDir::canonicalPath()
@@ -1546,6 +1561,32 @@ void tst_QDir::updateFileLists()
     QCOMPARE(dir.entryList(), QStringList() << "sub-dir1" << "sub-dir2" << "file1.txt");
 }
 
+#if defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN)
+void tst_QDir::isRoot_data()
+{
+    QTest::addColumn<QString>("path");
+    QTest::addColumn<bool>("isRoot");
+
+    QString test = QDir::rootPath();
+    QTest::newRow(QString("rootPath " + test).toLatin1()) << test << true;
+    test = QDir::rootPath().append("./");
+    QTest::newRow(QString("./ appended " + test).toLatin1()) << test << false;
+    test = QDir(QDir::rootPath().append("./")).canonicalPath();
+    QTest::newRow(QString("canonicalPath " + test).toLatin1()) << test << true;
+    test = QDir::rootPath().left(2);
+    QTest::newRow(QString("drive relative " + test).toLatin1()) << test << false;
+}
+
+void tst_QDir::isRoot()
+{
+    QFETCH(QString, path);
+    QFETCH(bool, isRoot);
+
+    QDir dir(path);
+    QCOMPARE(dir.isRoot(),isRoot);
+}
+#endif
+
 QTEST_MAIN(tst_QDir)
 #include "tst_qdir.moc"
 
diff --git a/tests/auto/qfileinfo/tst_qfileinfo.cpp b/tests/auto/qfileinfo/tst_qfileinfo.cpp
index f61426d..4387553 100644
--- a/tests/auto/qfileinfo/tst_qfileinfo.cpp
+++ b/tests/auto/qfileinfo/tst_qfileinfo.cpp
@@ -155,6 +155,9 @@ private slots:
 
     void isHidden_data();
     void isHidden();
+#if defined(Q_OS_MAC)
+    void isHiddenFromFinder();
+#endif
 
     void isBundle_data();
     void isBundle();
@@ -190,6 +193,8 @@ tst_QFileInfo::~tst_QFileInfo()
     QFile::remove("link.lnk");
     QFile::remove("file1");
     QFile::remove("dummyfile");
+    QFile::remove("simplefile.txt");
+    QFile::remove("longFileNamelongFileNamelongFileNamelongFileNamelongFileNamelongFileNamelongFileNamelongFileNamelongFileNamelongFileNamelongFileNamelongFileNamelongFileNamelongFileNamelongFileNamelongFileNamelongFileNamelongFileNamelongFileNamelongFileName.txt");
 #ifdef Q_OS_SYMBIAN
     QFile::remove("hidden.txt");
     QFile::remove("nothidden.txt");
@@ -199,6 +204,7 @@ tst_QFileInfo::~tst_QFileInfo()
 
 #if defined(Q_OS_UNIX) && !defined(Q_OS_SYMBIAN)
     QDir().rmdir("./.hidden-directory");
+    QFile::remove("link_to_tst_qfileinfo");
 #endif
 #if defined(Q_OS_WIN) && !defined(Q_OS_WINCE)
     QDir().rmdir("./hidden-directory");
@@ -1177,6 +1183,27 @@ void tst_QFileInfo::isHidden()
     QCOMPARE(fi.isHidden(), isHidden);
 }
 
+#if defined(Q_OS_MAC)
+void tst_QFileInfo::isHiddenFromFinder()
+{
+    const char *filename = "test_foobar.txt";
+
+    QFile testFile(filename);
+    testFile.open(QIODevice::WriteOnly | QIODevice::Append);
+    testFile.write(QByteArray("world"));
+    testFile.close();
+
+    struct stat buf;
+    stat(filename, &buf);
+    chflags(filename, buf.st_flags | UF_HIDDEN);
+
+    QFileInfo fi(filename);
+    QCOMPARE(fi.isHidden(), true);
+
+    testFile.remove();
+}
+#endif
+
 void tst_QFileInfo::isBundle_data()
 {
     QTest::addColumn<QString>("path");
diff --git a/tests/auto/qscriptvalue/testgen/testgenerator.cpp b/tests/auto/qscriptvalue/testgen/testgenerator.cpp
index a291110..9d7d33d 100644
--- a/tests/auto/qscriptvalue/testgen/testgenerator.cpp
+++ b/tests/auto/qscriptvalue/testgen/testgenerator.cpp
@@ -162,7 +162,7 @@ static QString generateIsXXXDef(const QString& name, const QList<QString>& list)
                                "    initScriptValues();\n"\
                                "}\n"\
                                "\n"\
-                               "static QString %1_array [] = {%2};\n\n"\
+                               "static QString %1_array[] = {%2};\n\n"\
                                "void tst_QScriptValue::%1_makeData(const char* expr)\n"\
                                "{\n"\
                                "    static QSet<QString> %1;\n"\
@@ -193,9 +193,11 @@ static QString generateIsXXXDef(const QString& name, const QList<QString>& list)
     QStringList set;
     set.reserve(3 * list.count());
     foreach(const QString& t, list) {
+        if (!set.isEmpty())
+            set.append("\",");
         set.append("\n    \"");
         set.append(escape(t));
-        set.append("\",");
+        set.append("\"");
     }
 
     return result.arg(name, set.join(QString()), QString::number(list.count()));
@@ -211,8 +213,8 @@ static QString generateToXXXDef(const QString& name, const QList<QPair<QString,
                                  "    initScriptValues();\n"\
                                  "}\n"\
                                  "\n"\
-                                 "static QString %1_tagArray [] = {%4};\n\n"\
-                                 "static %2 %1_valueArray [] = {%5};\n\n"\
+                                 "static QString %1_tagArray[] = {%4};\n\n"\
+                                 "static %2 %1_valueArray[] = {%5};\n\n"\
                                  "void tst_QScriptValue::%1_makeData(const char* expr)\n"\
                                  "{\n"\
                                  "    static QHash<QString, %2> %1;\n"\
@@ -236,19 +238,23 @@ static QString generateToXXXDef(const QString& name, const QList<QPair<QString,
 
     typename QList<QPair<QString, T> >::const_iterator i = list.constBegin();
     QStringList tagSet, valueSet;
-    tagSet.reserve(list.count());
-    valueSet.reserve(list.count());
-    int tmp = -1;
-    for(; i != list.constEnd(); ++i) {
+    tagSet.reserve(4 * list.count());
+    valueSet.reserve(3 * list.count());
+    for(int lineBreaker = 0; i != list.constEnd(); ++i) {
         QPair<QString, T> t = *i;
         t.first = escape(t.first);
+        if (!valueSet.isEmpty()) {
+            valueSet.append(QString(","));
+            tagSet.append(QString::fromAscii(","));
+        }
         tagSet.append(QString("\n    \""));
         tagSet.append(t.first);
-        tagSet.append(QString::fromAscii("\","));
-        if (!((++tmp)%2))
+        tagSet.append(QString::fromAscii("\""));
+        if (!((lineBreaker++)%2))
             valueSet.append(QString("\n    "));
+        else
+            valueSet.append(QString::fromAscii(" "));
         valueSet.append(prepareToInsert<T>(t.second));
-        valueSet.append(QString::fromAscii(", "));
     }
     return result.arg(name,
                       typeName<T>(),
@@ -268,8 +274,8 @@ QString generateToXXXDef<qsreal>(const QString& name, const QList<QPair<QString,
                                  "    initScriptValues();\n"\
                                  "}\n"\
                                  "\n"\
-                                 "static QString %1_tagArray [] = {%3};\n"\
-                                 "static %2 %1_valueArray [] = {%4};\n"\
+                                 "static QString %1_tagArray[] = {%3};\n"\
+                                 "static %2 %1_valueArray[] = {%4};\n"\
                                  "void tst_QScriptValue::%1_makeData(const char* expr)\n"\
                                  "{\n"\
                                  "    static QHash<QString, %2> %1;\n"\
@@ -299,20 +305,25 @@ QString generateToXXXDef<qsreal>(const QString& name, const QList<QPair<QString,
 
     QList<QPair<QString, qsreal> >::const_iterator i = list.constBegin();
     QStringList tagSet, valueSet;
-    tagSet.reserve(list.count());
-    valueSet.reserve(list.count());
-    int tmp = -1;
-    for(; i != list.constEnd(); ++i) {
+    tagSet.reserve(4 * list.count());
+    valueSet.reserve(3 * list.count());
+    for(int lineBreaker = 0; i != list.constEnd(); ++i) {
         QPair<QString, qsreal> t = *i;
         t.first = escape(t.first);
+        if (!valueSet.isEmpty()) {
+            valueSet.append(QString(","));
+            tagSet.append(QString::fromAscii(","));
+        }
         tagSet.append(QString("\n    \""));
         tagSet.append(t.first);
-        tagSet.append(QString::fromAscii("\","));
-        if (!((++tmp)%10))
+        tagSet.append(QString::fromAscii("\""));
+        if (!((lineBreaker++)%10))
             valueSet.append(QString("\n    "));
+        else
+            valueSet.append(QString::fromAscii(" "));
         valueSet.append(prepareToInsert<qsreal>(t.second));
-        valueSet.append(QString::fromAscii(", "));
     }
+
     // toInteger shouldn't return NaN, so it would be nice to catch the case.
     QString hook;
     if (name == "toNumber") {
@@ -340,8 +351,8 @@ static QString generateCastDef(const QList<QPair<QString, T> >& list)
                                  "    initScriptValues();\n"\
                                  "}\n"\
                                  "\n"\
-                                 "static QString qscriptvalue_cast%1_tagArray [] = {%2};\n"\
-                                 "static %1 qscriptvalue_cast%1_valueArray [] = {%3};\n"\
+                                 "static QString qscriptvalue_cast%1_tagArray[] = {%2};\n"\
+                                 "static %1 qscriptvalue_cast%1_valueArray[] = {%3};\n"\
                                  "void tst_QScriptValue::qscriptvalue_cast%1_makeData(const char* expr)\n"\
                                  "{\n"\
                                  "    static QHash<QString, %1> value;\n"\
@@ -365,19 +376,23 @@ static QString generateCastDef(const QList<QPair<QString, T> >& list)
 
     typename QList<QPair<QString, T> >::const_iterator i = list.constBegin();
     QStringList tagSet, valueSet;
-    tagSet.reserve(list.count());
-    valueSet.reserve(list.count());
-    int tmp = -1;
-    for(; i != list.constEnd(); ++i) {
+    tagSet.reserve(4 * list.count());
+    valueSet.reserve(3 * list.count());
+    for(int lineBreaker = 0; i != list.constEnd(); ++i) {
         QPair<QString, T> t = *i;
         t.first = escape(t.first);
+        if (!valueSet.isEmpty()) {
+            valueSet.append(QString(","));
+            tagSet.append(QString::fromAscii(","));
+        }
         tagSet.append(QString("\n    \""));
         tagSet.append(t.first);
-        tagSet.append(QString::fromAscii("\","));
-        if (!((++tmp)%2))
+        tagSet.append(QString::fromAscii("\""));
+        if (!((lineBreaker++)%2))
             valueSet.append(QString("\n    "));
+        else
+            valueSet.append(QString::fromAscii(" "));
         valueSet.append(prepareToInsert<T>(t.second));
-        valueSet.append(QString::fromAscii(", "));
     }
     return result.arg(typeName<T>(), tagSet.join(QString()), valueSet.join(QString()), QString::number(list.count()));
 }
@@ -392,8 +407,8 @@ QString generateCastDef<qsreal>(const QList<QPair<QString, qsreal> >& list)
                                  "    initScriptValues();\n"\
                                  "}\n"\
                                  "\n"\
-                                 "static QString qscriptvalue_cast%1_tagArray [] = {%2};\n"\
-                                 "static %1 qscriptvalue_cast%1_valueArray [] = {%3};\n"\
+                                 "static QString qscriptvalue_cast%1_tagArray[] = {%2};\n"\
+                                 "static %1 qscriptvalue_cast%1_valueArray[] = {%3};\n"\
                                  "void tst_QScriptValue::qscriptvalue_cast%1_makeData(const char* expr)\n"\
                                  "{\n"\
                                  "    static QHash<QString, %1> value;\n"\
@@ -427,19 +442,23 @@ QString generateCastDef<qsreal>(const QList<QPair<QString, qsreal> >& list)
 
     QList<QPair<QString, qsreal> >::const_iterator i = list.constBegin();
     QStringList tagSet, valueSet;
-    tagSet.reserve(list.count());
-    valueSet.reserve(list.count());
-    int tmp = -1;
-    for(; i != list.constEnd(); ++i) {
+    tagSet.reserve(4 * list.count());
+    valueSet.reserve(3 * list.count());
+    for(int lineBreaker = 0; i != list.constEnd(); ++i) {
         QPair<QString, qsreal> t = *i;
         t.first = escape(t.first);
+        if (!valueSet.isEmpty()) {
+            valueSet.append(QString(","));
+            tagSet.append(QString::fromAscii(","));
+        }
         tagSet.append(QString("\n    \""));
         tagSet.append(t.first);
-        tagSet.append(QString::fromAscii("\","));
-        if (!((++tmp)%10))
+        tagSet.append(QString::fromAscii("\""));
+        if (!((lineBreaker++)%10))
             valueSet.append(QString("\n    "));
+        else
+            valueSet.append(QString::fromAscii(" "));
         valueSet.append(prepareToInsert<qsreal>(t.second));
-        valueSet.append(QString::fromAscii(", "));
     }
     return result.arg(typeName<qsreal>(),
                       tagSet.join(QString()),
@@ -457,7 +476,7 @@ static QString generateCompareDef(const QString& comparisionType, const QList<QS
                                  "    initScriptValues();\n"\
                                  "}\n"\
                                  "\n"\
-                                 "static QString %1_array [] = {%2};\n\n"\
+                                 "static QString %1_array[] = {%2};\n\n"\
                                  "void tst_QScriptValue::%1_makeData(const char *expr)\n"\
                                  "{\n"\
                                  "    static QSet<QString> equals;\n"\
@@ -488,9 +507,13 @@ static QString generateCompareDef(const QString& comparisionType, const QList<QS
     QString result = templ;
 
     QStringList set;
-    set.reserve(tags.count());
+    set.reserve(4 * tags.count());
     foreach(const QString& tmp, tags) {
-        set.append("\n    \"" + escape(tmp) + "\",");
+        if (!set.isEmpty())
+            set.append(",");
+        set.append("\n    \"");
+        set.append(escape(tmp));
+        set.append("\"");
     }
     return result.arg(comparisionType, set.join(""), QString::number(tags.count()));
 }
@@ -500,7 +523,7 @@ static QString generateInitDef(const QVector<QString>& allDataTags)
     static const QString templ = "void tst_QScriptValue::initScriptValues()\n"\
                                  "{\n"\
                                  "    m_values.clear();\n"\
-                                 "    if (engine) \n"\
+                                 "    if (engine)\n"\
                                  "        delete engine;\n"\
                                  "    engine = new QScriptEngine;\n"\
                                  "%1\n}\n\n";