From a97c0c3c996beaa2e657645e912e63b1502d8026 Mon Sep 17 00:00:00 2001 From: Jason McDonald Date: Wed, 26 Oct 2011 10:28:13 +1000 Subject: [PATCH] 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 --- .../corelib/concurrent/qtconcurrentfilter/tst_qtconcurrentfilter.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/tests/auto/corelib/concurrent/qtconcurrentfilter/tst_qtconcurrentfilter.cpp b/tests/auto/corelib/concurrent/qtconcurrentfilter/tst_qtconcurrentfilter.cpp index eae7a5c..91d61e2 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 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::size_type)(1)); QCOMPARE(*list2.begin(), 1); -#endif } #endif -- 2.7.4