1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove gcc 3.x-specific code from QtConcurrent and its tests.

Browse Source 
Change-Id: I4dd0ce50b70a47a0a00f4c7ec18077a1bcbe5705
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
This commit is contained in:
Jason McDonald 2012-03-09 13:50:19 +10:00 committed by Qt by Nokia
parent 4dfeb18758
commit 074508c2ca
3 changed files with 0 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/concurrent/qtconcurrent_global.h
View File

@ -68,13 +68,6 @@
# endif # endif
#endif #endif
// gcc 3 version has problems with some of the
// map/filter overloads.
#if defined(Q_CC_GNU) && (__GNUC__ < 4)
# define QT_NO_CONCURRENT_MAP
# define QT_NO_CONCURRENT_FILTER
#endif
#if defined (Q_CC_MSVC) && (_MSC_VER < 1300) #if defined (Q_CC_MSVC) && (_MSC_VER < 1300)
# define QT_TYPENAME # define QT_TYPENAME
#else #else

14
tests/auto/concurrent/qtconcurrentfilter/tst_qtconcurrentfilter.cpp
View File

@ -51,9 +51,6 @@ class tst_QtConcurrentFilter : public QObject
Q_OBJECT Q_OBJECT
private slots: private slots:
#ifdef QT_NO_CONCURRENT_FILTER
void initTestCase();
#else
void filter(); void filter();
void filtered(); void filtered();
void filteredReduced(); void filteredReduced();
@ -63,17 +60,8 @@ private slots:
#ifndef QT_NO_STL #ifndef QT_NO_STL
void stlContainers(); void stlContainers();
#endif #endif
#endif
}; };
#ifdef QT_NO_CONCURRENT_FILTER
void tst_QtConcurrentFilter::initTestCase()
{
QSKIP("This test is skipped for gcc 3.x");
}
#else
void tst_QtConcurrentFilter::filter() void tst_QtConcurrentFilter::filter()
{ {
// functor // functor
@ -1537,7 +1525,5 @@ void tst_QtConcurrentFilter::stlContainers()
} }
#endif #endif
#endif
QTEST_MAIN(tst_QtConcurrentFilter) QTEST_MAIN(tst_QtConcurrentFilter)
#include "tst_qtconcurrentfilter.moc" #include "tst_qtconcurrentfilter.moc"

14
tests/auto/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp
View File

@ -59,9 +59,6 @@ class tst_QtConcurrentMap: public QObject
{ {
Q_OBJECT Q_OBJECT
private slots: private slots:
#ifdef QT_NO_CONCURRENT_MAP
void initTestCase()
#else
void map(); void map();
void blocking_map(); void blocking_map();
void mapped(); void mapped();
@ -82,17 +79,8 @@ private slots:
void stressTest(); void stressTest();
public slots: public slots:
void throttling(); void throttling();
#endif
}; };
#ifdef QT_NO_CONCURRENT_FILTER
void tst_QtConcurrentFilter::initTestCase()
{
QSKIP("This test is skipped for gcc 3.x");
}
#else
using namespace QtConcurrent; using namespace QtConcurrent;
void multiplyBy2Immutable(int x) void multiplyBy2Immutable(int x)
@ -2420,7 +2408,5 @@ void tst_QtConcurrentMap::stressTest()
} }
} }
#endif
QTEST_MAIN(tst_QtConcurrentMap) QTEST_MAIN(tst_QtConcurrentMap)
#include "tst_qtconcurrentmap.moc" #include "tst_qtconcurrentmap.moc"