From 8955e088aa9e4b0496c32f27206fd6211a85782f Mon Sep 17 00:00:00 2001 From: Zeno Albisser Date: Wed, 5 May 2010 16:36:02 +0200 Subject: Fix for qfsfileengine_win to return proper absolute path for C:\ When using canonicalPath on a QDir that currently just represents a root directory, a valid path name such as "C:\" should be returned. Previously we returned "C:" which in fact would point to the current working directory on drive C: and therefor is not necessarily the same. Reviewed-by: Thiago Task-number: QTBUG-6680 --- src/corelib/io/qfsfileengine_win.cpp | 10 +++++---- tests/auto/qdir/tst_qdir.cpp | 41 ++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 4 deletions(-) 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..b2dc960 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::rootPath().left(2) << QDir::currentPath(); +#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("path"); + QTest::addColumn("isRoot"); + + QString test = QDir::rootPath(); + QTest::newRow("rootPath " + test) << test << true; + test = QDir::rootPath().append("./"); + QTest::newRow("./ appended " + test) << test << false; + test = QDir(QDir::rootPath().append("./")).canonicalPath(); + QTest::newRow("canonicalPath " + test) << test << true; + test = QDir::rootPath().left(2); + QTest::newRow("drive relative " + test) << 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" -- cgit v0.12 From 5f52316a90b7e77295cefc5fac9d4acd0761d79f Mon Sep 17 00:00:00 2001 From: Zeno Albisser Date: Mon, 10 May 2010 09:50:18 +0200 Subject: Fix tst_qdir to use const char* instead of QString for QTest::newRow This is only needed to compile on msvc2005 Reviewed-by: TrustMe --- tests/auto/qdir/tst_qdir.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/auto/qdir/tst_qdir.cpp b/tests/auto/qdir/tst_qdir.cpp index b2dc960..4704bb8 100644 --- a/tests/auto/qdir/tst_qdir.cpp +++ b/tests/auto/qdir/tst_qdir.cpp @@ -1568,13 +1568,13 @@ void tst_QDir::isRoot_data() QTest::addColumn("isRoot"); QString test = QDir::rootPath(); - QTest::newRow("rootPath " + test) << test << true; + QTest::newRow(QString("rootPath " + test).toLatin1()) << test << true; test = QDir::rootPath().append("./"); - QTest::newRow("./ appended " + test) << test << false; + QTest::newRow(QString("./ appended " + test).toLatin1()) << test << false; test = QDir(QDir::rootPath().append("./")).canonicalPath(); - QTest::newRow("canonicalPath " + test) << test << true; + QTest::newRow(QString("canonicalPath " + test).toLatin1()) << test << true; test = QDir::rootPath().left(2); - QTest::newRow("drive relative " + test) << test << false; + QTest::newRow(QString("drive relative " + test).toLatin1()) << test << false; } void tst_QDir::isRoot() -- cgit v0.12 From b32a3940f0d23332c73b8e0b60c442cdda91e67e Mon Sep 17 00:00:00 2001 From: Zeno Albisser Date: Mon, 10 May 2010 13:25:54 +0200 Subject: Fix for root path issue in tst_qdir. (case "drive:") Windows only: Since the working directory is not necessarily located on the root drive, we should not rely on rootPath for the test. Reviewed-by: TrustMe --- tests/auto/qdir/tst_qdir.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/auto/qdir/tst_qdir.cpp b/tests/auto/qdir/tst_qdir.cpp index 4704bb8..661a4c7 100644 --- a/tests/auto/qdir/tst_qdir.cpp +++ b/tests/auto/qdir/tst_qdir.cpp @@ -818,7 +818,7 @@ void tst_QDir::canonicalPath_data() 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::rootPath().left(2) << QDir::currentPath(); + QTest::newRow("drive:") << QDir().canonicalPath().left(2) << QDir().canonicalPath(); #endif } -- cgit v0.12 From 10f6220cc37207dbc35bd013af727552fb3799f7 Mon Sep 17 00:00:00 2001 From: Fabien Freling Date: Tue, 11 May 2010 16:10:32 +0200 Subject: Fix the hidden status check for a file on Mac OS X. Add some more tests that would have failed before the fix. Remove test files after the run. Task-number: QTBUG-6619 Reviewed-by: Morten Sorvig --- src/corelib/io/qfsfileengine_unix.cpp | 3 +++ tests/auto/qfileinfo/tst_qfileinfo.cpp | 5 +++++ 2 files changed, 8 insertions(+) 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/tests/auto/qfileinfo/tst_qfileinfo.cpp b/tests/auto/qfileinfo/tst_qfileinfo.cpp index f61426d..c7dce28 100644 --- a/tests/auto/qfileinfo/tst_qfileinfo.cpp +++ b/tests/auto/qfileinfo/tst_qfileinfo.cpp @@ -190,6 +190,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 +201,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"); @@ -1128,6 +1131,8 @@ void tst_QFileInfo::isHidden_data() #if defined(Q_OS_MAC) // /bin has the hidden attribute on Mac OS X QTest::newRow("/bin/") << QString::fromLatin1("/bin/") << true; + QTest::newRow("/dev/") << QString::fromLatin1("/dev/") << true; + QTest::newRow("/net/") << QString::fromLatin1("/net/") << true; #elif !defined(Q_OS_WIN) && !defined(Q_OS_SYMBIAN) QTest::newRow("/bin/") << QString::fromLatin1("/bin/") << false; #endif -- cgit v0.12 From e35304444d6413d00c2090fab5d8173e6b6b7f26 Mon Sep 17 00:00:00 2001 From: Jedrzej Nowacki Date: Wed, 12 May 2010 12:18:54 +0200 Subject: QScriptValue autotest generator modification. Generator shouldn't leave whitespace at the end of line in the generated code. Reviewed-by: Kent Hansen --- tests/auto/qscriptvalue/testgen/testgenerator.cpp | 41 ++++++++++++++--------- 1 file changed, 25 insertions(+), 16 deletions(-) diff --git a/tests/auto/qscriptvalue/testgen/testgenerator.cpp b/tests/auto/qscriptvalue/testgen/testgenerator.cpp index a291110..8e6d8e1 100644 --- a/tests/auto/qscriptvalue/testgen/testgenerator.cpp +++ b/tests/auto/qscriptvalue/testgen/testgenerator.cpp @@ -238,17 +238,19 @@ static QString generateToXXXDef(const QString& name, const QList t = *i; t.first = escape(t.first); tagSet.append(QString("\n \"")); tagSet.append(t.first); tagSet.append(QString::fromAscii("\",")); - if (!((++tmp)%2)) + if (!valueSet.isEmpty()) + valueSet.append(QString(",")); + if (!((lineBreaker++)%2)) valueSet.append(QString("\n ")); + else + valueSet.append(QString::fromAscii(" ")); valueSet.append(prepareToInsert(t.second)); - valueSet.append(QString::fromAscii(", ")); } return result.arg(name, typeName(), @@ -301,18 +303,21 @@ QString generateToXXXDef(const QString& name, const QList t = *i; t.first = escape(t.first); tagSet.append(QString("\n \"")); tagSet.append(t.first); tagSet.append(QString::fromAscii("\",")); - if (!((++tmp)%10)) + if (!valueSet.isEmpty()) + valueSet.append(QString(",")); + if (!((lineBreaker++)%10)) valueSet.append(QString("\n ")); + else + valueSet.append(QString::fromAscii(" ")); valueSet.append(prepareToInsert(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") { @@ -367,17 +372,19 @@ static QString generateCastDef(const QList >& list) QStringList tagSet, valueSet; tagSet.reserve(list.count()); valueSet.reserve(list.count()); - int tmp = -1; - for(; i != list.constEnd(); ++i) { + for(int lineBreaker = 0; i != list.constEnd(); ++i) { QPair t = *i; t.first = escape(t.first); tagSet.append(QString("\n \"")); tagSet.append(t.first); tagSet.append(QString::fromAscii("\",")); - if (!((++tmp)%2)) + if (!valueSet.isEmpty()) + valueSet.append(QString(",")); + if (!((lineBreaker++)%2)) valueSet.append(QString("\n ")); + else + valueSet.append(QString::fromAscii(" ")); valueSet.append(prepareToInsert(t.second)); - valueSet.append(QString::fromAscii(", ")); } return result.arg(typeName(), tagSet.join(QString()), valueSet.join(QString()), QString::number(list.count())); } @@ -429,17 +436,19 @@ QString generateCastDef(const QList >& list) QStringList tagSet, valueSet; tagSet.reserve(list.count()); valueSet.reserve(list.count()); - int tmp = -1; - for(; i != list.constEnd(); ++i) { + for(int lineBreaker = 0; i != list.constEnd(); ++i) { QPair t = *i; t.first = escape(t.first); tagSet.append(QString("\n \"")); tagSet.append(t.first); tagSet.append(QString::fromAscii("\",")); - if (!((++tmp)%10)) + if (!valueSet.isEmpty()) + valueSet.append(QString(",")); + if (!((lineBreaker++)%10)) valueSet.append(QString("\n ")); + else + valueSet.append(QString::fromAscii(" ")); valueSet.append(prepareToInsert(t.second)); - valueSet.append(QString::fromAscii(", ")); } return result.arg(typeName(), tagSet.join(QString()), -- cgit v0.12 From 366913da05d833ebf447a061f9d859ec3a344658 Mon Sep 17 00:00:00 2001 From: Fabien Freling Date: Wed, 12 May 2010 15:32:40 +0200 Subject: Fix Mac-specific tests about the hidden attribute. Create a new test only for Mac. --- tests/auto/qfileinfo/tst_qfileinfo.cpp | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/tests/auto/qfileinfo/tst_qfileinfo.cpp b/tests/auto/qfileinfo/tst_qfileinfo.cpp index c7dce28..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(); @@ -1131,8 +1134,6 @@ void tst_QFileInfo::isHidden_data() #if defined(Q_OS_MAC) // /bin has the hidden attribute on Mac OS X QTest::newRow("/bin/") << QString::fromLatin1("/bin/") << true; - QTest::newRow("/dev/") << QString::fromLatin1("/dev/") << true; - QTest::newRow("/net/") << QString::fromLatin1("/net/") << true; #elif !defined(Q_OS_WIN) && !defined(Q_OS_SYMBIAN) QTest::newRow("/bin/") << QString::fromLatin1("/bin/") << false; #endif @@ -1182,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("path"); -- cgit v0.12 From 0c6973b15cc3884f35d7d414ab7d23d365c768e8 Mon Sep 17 00:00:00 2001 From: Jedrzej Nowacki Date: Wed, 12 May 2010 17:07:42 +0200 Subject: Fix a coding style issue in a generated code in the QScriptValue tests. Fix the generator, few redundant commas and spaces where removed from generated code. The autotest suite wasn't regenerated. Reviewed-by: Kent Hansen --- tests/auto/qscriptvalue/testgen/testgenerator.cpp | 82 +++++++++++++---------- 1 file changed, 48 insertions(+), 34 deletions(-) diff --git a/tests/auto/qscriptvalue/testgen/testgenerator.cpp b/tests/auto/qscriptvalue/testgen/testgenerator.cpp index 8e6d8e1..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& 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 %1;\n"\ @@ -193,9 +193,11 @@ static QString generateIsXXXDef(const QString& name, const QList& 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 %1;\n"\ @@ -236,16 +238,18 @@ static QString generateToXXXDef(const QString& name, const QList >::const_iterator i = list.constBegin(); QStringList tagSet, valueSet; - tagSet.reserve(list.count()); - valueSet.reserve(list.count()); + tagSet.reserve(4 * list.count()); + valueSet.reserve(3 * list.count()); for(int lineBreaker = 0; i != list.constEnd(); ++i) { QPair 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 (!valueSet.isEmpty()) - valueSet.append(QString(",")); + tagSet.append(QString::fromAscii("\"")); if (!((lineBreaker++)%2)) valueSet.append(QString("\n ")); else @@ -270,8 +274,8 @@ QString generateToXXXDef(const QString& name, const QList %1;\n"\ @@ -301,16 +305,18 @@ QString generateToXXXDef(const QString& name, const QList >::const_iterator i = list.constBegin(); QStringList tagSet, valueSet; - tagSet.reserve(list.count()); - valueSet.reserve(list.count()); + tagSet.reserve(4 * list.count()); + valueSet.reserve(3 * list.count()); for(int lineBreaker = 0; i != list.constEnd(); ++i) { QPair 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 (!valueSet.isEmpty()) - valueSet.append(QString(",")); + tagSet.append(QString::fromAscii("\"")); if (!((lineBreaker++)%10)) valueSet.append(QString("\n ")); else @@ -345,8 +351,8 @@ static QString generateCastDef(const QList >& 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 value;\n"\ @@ -370,16 +376,18 @@ static QString generateCastDef(const QList >& list) typename QList >::const_iterator i = list.constBegin(); QStringList tagSet, valueSet; - tagSet.reserve(list.count()); - valueSet.reserve(list.count()); + tagSet.reserve(4 * list.count()); + valueSet.reserve(3 * list.count()); for(int lineBreaker = 0; i != list.constEnd(); ++i) { QPair 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 (!valueSet.isEmpty()) - valueSet.append(QString(",")); + tagSet.append(QString::fromAscii("\"")); if (!((lineBreaker++)%2)) valueSet.append(QString("\n ")); else @@ -399,8 +407,8 @@ QString generateCastDef(const QList >& 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 value;\n"\ @@ -434,16 +442,18 @@ QString generateCastDef(const QList >& list) QList >::const_iterator i = list.constBegin(); QStringList tagSet, valueSet; - tagSet.reserve(list.count()); - valueSet.reserve(list.count()); + tagSet.reserve(4 * list.count()); + valueSet.reserve(3 * list.count()); for(int lineBreaker = 0; i != list.constEnd(); ++i) { QPair 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 (!valueSet.isEmpty()) - valueSet.append(QString(",")); + tagSet.append(QString::fromAscii("\"")); if (!((lineBreaker++)%10)) valueSet.append(QString("\n ")); else @@ -466,7 +476,7 @@ static QString generateCompareDef(const QString& comparisionType, const QList equals;\n"\ @@ -497,9 +507,13 @@ static QString generateCompareDef(const QString& comparisionType, const QList& 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"; -- cgit v0.12