diff options
| author | Jason McDonald <jason.mcdonald@nokia.com> | 2011-10-26 11:49:57 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-27 06:12:09 +0200 |
| commit | 238c3046134cf184c642d75e69fc2fb85a29e057 (patch) | |
| tree | 257b45b31cc5716f98074b70a660c2f655332345 /tests/auto/tools | |
| parent | eeaf05155804dccfcd32adf78ccdf129b99c7708 (diff) | |
Remove obsolete MSVC workarounds from autotests.
Qt5 doesn't support MSVC versions before 2008, so workarounds for
earlier versions are no longer required.
Change-Id: I429feff99fe61d286637b960d92fd58962f8aefa
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'tests/auto/tools')
| -rw-r--r-- | tests/auto/tools/moc/tst_moc.cpp | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/tests/auto/tools/moc/tst_moc.cpp b/tests/auto/tools/moc/tst_moc.cpp index 62d5a50c85..1ce6f0c4ef 100644 --- a/tests/auto/tools/moc/tst_moc.cpp +++ b/tests/auto/tools/moc/tst_moc.cpp @@ -71,11 +71,6 @@ #include "parse-boost.h" #endif -// No such thing as "long long" in Microsoft's compiler 13.0 and before -#if defined Q_CC_MSVC && _MSC_VER <= 1310 -# define NOLONGLONG -#endif - QT_USE_NAMESPACE struct MyStruct {}; @@ -284,13 +279,11 @@ private slots: inline void dummy2() MACRO_WITH_POSSIBLE_COMPILER_SPECIFIC_ATTRIBUTES const {} inline void dummy3() const MACRO_WITH_POSSIBLE_COMPILER_SPECIFIC_ATTRIBUTES {} -#ifndef NOLONGLONG void slotWithULongLong(unsigned long long) {} void slotWithULongLongP(unsigned long long*) {} void slotWithULong(unsigned long) {} void slotWithLongLong(long long) {} void slotWithLong(long) {} -#endif void slotWithColonColonType(::Int::Type) {} @@ -456,9 +449,7 @@ private slots: void oldStyleCasts(); void warnOnExtraSignalSlotQualifiaction(); #endif -#ifndef NOLONGLONG void uLongLong(); -#endif #if !defined(MOC_CROSS_COMPILED) && defined(Q_OS_LINUX) && defined(Q_CC_GNU) && !defined(QT_NO_PROCESS) void inputFileNameWithDotsButNoExtension(); #endif @@ -626,8 +617,6 @@ void tst_Moc::warnOnExtraSignalSlotQualifiaction() } #endif -// long long doesn't work on MSVC6 & .NET 2002, also skipped on 2003 due to compiler version issue with moc -#ifndef NOLONGLONG void tst_Moc::uLongLong() { TestClass tst; @@ -644,7 +633,6 @@ void tst_Moc::uLongLong() idx = mobj->indexOfSlot("slotWithLongLong(long long)"); QVERIFY(idx != -1); } -#endif // Only tested on linux/gcc. Not tested when cross-compiled. #if !defined(MOC_CROSS_COMPILED) && defined(Q_OS_LINUX) && defined(Q_CC_GNU) && !defined(QT_NO_PROCESS) |