summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-02-02 04:47:27 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-02-02 04:47:27 (GMT)
commit57d33781bd8e02904a85de7fc54f8f4e8bd299e6 (patch)
tree97d73379096470650a10e0bfb7ebcfe212cacd6b /tests
parent64ca7030df6189a0bc4df36473befd868c8d2ef6 (diff)
parent669d23710f449617a327cf38b7d09867b28335ff (diff)
downloadQt-57d33781bd8e02904a85de7fc54f8f4e8bd299e6.zip
Qt-57d33781bd8e02904a85de7fc54f8f4e8bd299e6.tar.gz
Qt-57d33781bd8e02904a85de7fc54f8f4e8bd299e6.tar.bz2
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fixed maketestselftest failure with some MSVC versions. Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( afc4c208fe296f5a1dd0e73f2bd1273bd22d9b24 ) Fix a problem with overlay icons in the fileiconprovider Only set the _WIN32_WINNT define if it is not set or less than 0x0400
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/maketestselftest/tst_maketestselftest.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/tests/auto/maketestselftest/tst_maketestselftest.cpp b/tests/auto/maketestselftest/tst_maketestselftest.cpp
index c674202..ef92c56 100644
--- a/tests/auto/maketestselftest/tst_maketestselftest.cpp
+++ b/tests/auto/maketestselftest/tst_maketestselftest.cpp
@@ -92,6 +92,9 @@ void tst_MakeTestSelfTest::auto_dot_pro_data()
QStringList subdirs = dir.entryList(QDir::AllDirs|QDir::NoDotAndDotDot);
foreach (const QString& subdir, subdirs) {
+ if (subdir == QString::fromLatin1("tmp")) {
+ continue;
+ }
QTest::newRow(qPrintable(subdir)) << subdir;
}
}