summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorJason McDonald <jason.mcdonald@nokia.com>2011-10-26 10:28:13 +1000
committerQt by Nokia <qt-info@nokia.com>2011-10-27 01:38:39 +0200
commita97c0c3c996beaa2e657645e912e63b1502d8026 (patch)
tree99ba9b0389cd502953c564dd84e8f8566805c1b9 /tests
parent014581f2559ffe02c477c5e6592a7b81ec6c5b01 (diff)
Remove obsolete QSKIP call.
The bug referenced in the QSKIP has been marked as resolved, so this QSKIP should no longer be needed. Change-Id: I41dd964827a3df8fb5ebb9674cef9db59c03d432 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/corelib/concurrent/qtconcurrentfilter/tst_qtconcurrentfilter.cpp4
1 files changed, 0 insertions, 4 deletions
diff --git a/tests/auto/corelib/concurrent/qtconcurrentfilter/tst_qtconcurrentfilter.cpp b/tests/auto/corelib/concurrent/qtconcurrentfilter/tst_qtconcurrentfilter.cpp
index eae7a5c6e5..91d61e29d4 100644
--- a/tests/auto/corelib/concurrent/qtconcurrentfilter/tst_qtconcurrentfilter.cpp
+++ b/tests/auto/corelib/concurrent/qtconcurrentfilter/tst_qtconcurrentfilter.cpp
@@ -1511,9 +1511,6 @@ void tst_QtConcurrentFilter::noDetatch()
#ifndef QT_NO_STL
void tst_QtConcurrentFilter::stlContainers()
{
-#if defined(_MSC_VER) && _MSC_VER >= 1600
- QSKIP("Test does not compile with MSVC 2010 (see QTBUG-18996)");
-#else
std::vector<int> vector;
vector.push_back(1);
vector.push_back(2);
@@ -1537,7 +1534,6 @@ void tst_QtConcurrentFilter::stlContainers()
QtConcurrent::blockingFilter(list, waitFilterfn);
QCOMPARE(list2.size(), (std::list<int>::size_type)(1));
QCOMPARE(*list2.begin(), 1);
-#endif
}
#endif