diff options
| author | João Abecasis <joao.abecasis@nokia.com> | 2012-02-05 21:25:31 +0100 |
|---|---|---|
| committer | João Abecasis <joao.abecasis@nokia.com> | 2012-02-05 21:26:33 +0100 |
| commit | d065dfd454890c332482a6109ed34a989e50809b (patch) | |
| tree | 0d3e9c5367c1fad7d089d368182374e8d1d46ca1 /tests/auto/corelib/concurrent/qtconcurrentfilter/qtconcurrentfilter.pro | |
| parent | 632840cb0f5ad355d87fc040b015d04af86371ec (diff) | |
| parent | 9f54846d951838361f4188b423e7aa7c7b9a9540 (diff) | |
Merge remote-tracking branch 'gerrit/master' into containers
Conflicts:
src/corelib/tools/qstring.cpp
Change-Id: I23d214bf33c2badfae1876da3cc7d6d8f6e635fb
Diffstat (limited to 'tests/auto/corelib/concurrent/qtconcurrentfilter/qtconcurrentfilter.pro')
| -rw-r--r-- | tests/auto/corelib/concurrent/qtconcurrentfilter/qtconcurrentfilter.pro | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/tests/auto/corelib/concurrent/qtconcurrentfilter/qtconcurrentfilter.pro b/tests/auto/corelib/concurrent/qtconcurrentfilter/qtconcurrentfilter.pro deleted file mode 100644 index f783455b2e..0000000000 --- a/tests/auto/corelib/concurrent/qtconcurrentfilter/qtconcurrentfilter.pro +++ /dev/null @@ -1,7 +0,0 @@ -CONFIG += testcase parallel_test -TARGET = tst_qtconcurrentfilter -QT = core testlib -SOURCES = tst_qtconcurrentfilter.cpp -DEFINES += QT_STRICT_ITERATORS - -CONFIG += insignificant_test # See QTBUG-20688 |