diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-25 13:01:16 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-25 13:01:16 (GMT) |
| commit | 09ecb50448bc3255c80764dbc267bb6a77195287 (patch) | |
| tree | a2eccfaf03ae921b49b2ba0fa7c45eac014fb6f0 /tests/auto/qscriptv8testsuite/abstracttestsuite.cpp | |
| parent | a4b3fb256c25ce7b6e8b9fd162ee11ae4338fa76 (diff) | |
| parent | 07f975eef127048b8150b368259afcad183e6424 (diff) | |
| download | Qt-09ecb50448bc3255c80764dbc267bb6a77195287.zip Qt-09ecb50448bc3255c80764dbc267bb6a77195287.tar.gz Qt-09ecb50448bc3255c80764dbc267bb6a77195287.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging:
Skip failing tests
QDir: Fix absolute paths when using file engines
Diffstat (limited to 'tests/auto/qscriptv8testsuite/abstracttestsuite.cpp')
| -rw-r--r-- | tests/auto/qscriptv8testsuite/abstracttestsuite.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/tests/auto/qscriptv8testsuite/abstracttestsuite.cpp b/tests/auto/qscriptv8testsuite/abstracttestsuite.cpp index d47eb24..0978293 100644 --- a/tests/auto/qscriptv8testsuite/abstracttestsuite.cpp +++ b/tests/auto/qscriptv8testsuite/abstracttestsuite.cpp @@ -276,8 +276,11 @@ bool TestConfigParser::isKnownSymbol(const QString &symbol) << "Q_OS_SOLARIS" << "Q_OS_WINCE" << "Q_OS_SYMBIAN" + << "Q_OS_MAC" + << "Q_OS_WIN" << "Q_CC_MSVC" << "Q_CC_MINGW" + << "Q_CC_INTEL" ; } return knownSymbols.contains(symbol); @@ -299,12 +302,21 @@ bool TestConfigParser::isDefined(const QString &symbol) #ifdef Q_OS_SYMBIAN << "Q_OS_SYMBIAN" #endif +#ifdef Q_OS_MAC + << "Q_OS_MAC" +#endif +#ifdef Q_OS_WIN + << "Q_OS_WIN" +#endif #ifdef Q_CC_MSVC << "Q_CC_MSVC" #endif #ifdef Q_CC_MINGW << "Q_CC_MINGW" #endif +#ifdef Q_CC_INTEL + << "Q_CC_INTEL" +#endif ; } return definedSymbols.contains(symbol); |