diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-09-13 16:43:06 +0200 |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-09-13 16:43:06 +0200 |
| commit | 7a8cab928dd405973e102ad2e6703cdbbb6bd505 (patch) | |
| tree | d090a99f81d9889dae9ef4984b438edc1d6767ec /tests/auto/qscriptv8testsuite/abstracttestsuite.cpp | |
| parent | b4719a8cdeffc3991a63fed7df6489509173ebcd (diff) | |
| parent | 1f8aa220b50eb83205279441769fa697730b3e6f (diff) | |
| download | qtscript-7a8cab928dd405973e102ad2e6703cdbbb6bd505.tar.gz | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: Ia10bb1e8b5fa8bb93e76bf2e295df5c10336e582
Diffstat (limited to 'tests/auto/qscriptv8testsuite/abstracttestsuite.cpp')
| -rw-r--r-- | tests/auto/qscriptv8testsuite/abstracttestsuite.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/tests/auto/qscriptv8testsuite/abstracttestsuite.cpp b/tests/auto/qscriptv8testsuite/abstracttestsuite.cpp index 8bb185f..b22a3c7 100644 --- a/tests/auto/qscriptv8testsuite/abstracttestsuite.cpp +++ b/tests/auto/qscriptv8testsuite/abstracttestsuite.cpp @@ -42,6 +42,7 @@ #include "abstracttestsuite.h" #include <QtTest/QtTest> #include <QtCore/qset.h> +#include <QtCore/QSysInfo> #include <QtCore/qtextstream.h> #include <private/qmetaobjectbuilder_p.h> @@ -189,8 +190,14 @@ bool TestConfigParser::isKnownSymbol(const QString &symbol) << "Q_OS_MAC" << "Q_OS_WIN" << "Q_CC_MSVC" + << "Q_CC_MSVC32" + << "Q_CC_MSVC64" << "Q_CC_MINGW" + << "Q_CC_MINGW32" + << "Q_CC_MINGW64" << "Q_CC_INTEL" + << "Q_CC_INTEL32" + << "Q_CC_INTEL64" ; } return knownSymbols.contains(symbol); @@ -220,12 +227,15 @@ bool TestConfigParser::isDefined(const QString &symbol) #endif #ifdef Q_CC_MSVC << "Q_CC_MSVC" + << (QStringLiteral("Q_CC_MSVC") + QString::number(QSysInfo::WordSize)) #endif #ifdef Q_CC_MINGW << "Q_CC_MINGW" + << (QStringLiteral("Q_CC_MINGW") + QString::number(QSysInfo::WordSize)) #endif #ifdef Q_CC_INTEL << "Q_CC_INTEL" + << (QStringLiteral("Q_CC_INTEL") + QString::number(QSysInfo::WordSize)) #endif ; } |