diff options
| author | João Abecasis <joao.abecasis@nokia.com> | 2010-11-23 12:26:54 +0100 |
|---|---|---|
| committer | João Abecasis <joao.abecasis@nokia.com> | 2010-11-23 12:26:54 +0100 |
| commit | 802498fcd43558a10bb7477d3957cdd27fd8ec09 (patch) | |
| tree | c40ddd859b032ffa7ed9c6df1173312c0bb1947d /tests/auto/qdiriterator | |
| parent | 901fee7e610ec53f744416aeeca89c4605923120 (diff) | |
| parent | 538e7b8ddf45936bb274ed3230b591b3459edfa7 (diff) | |
Merge remote branch 'qt/master' into file-engine-refactor
Conflicts:
demos/declarative/minehunt/minehunt.pro
src/corelib/io/io.pri
src/corelib/io/qfsfileengine.cpp
src/corelib/io/qfsfileengine_unix.cpp
src/corelib/io/qfsfileengine_win.cpp
src/s60installs/bwins/QtCoreu.def
src/s60installs/bwins/QtDeclarativeu.def
src/s60installs/bwins/QtGuiu.def
src/s60installs/eabi/QtCoreu.def
src/s60installs/eabi/QtDeclarativeu.def
src/s60installs/eabi/QtGuiu.def
tests/auto/qapplication/test/test.pro
tests/auto/qaudioinput/qaudioinput.pro
tests/auto/qaudiooutput/qaudiooutput.pro
tests/auto/qchar/qchar.pro
tests/auto/qdiriterator/qdiriterator.pro
tests/auto/qsound/qsound.pro
Diffstat (limited to 'tests/auto/qdiriterator')
| -rw-r--r-- | tests/auto/qdiriterator/qdiriterator.pro | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/auto/qdiriterator/qdiriterator.pro b/tests/auto/qdiriterator/qdiriterator.pro index 0a154d6747..0807a18f8f 100644 --- a/tests/auto/qdiriterator/qdiriterator.pro +++ b/tests/auto/qdiriterator/qdiriterator.pro @@ -5,3 +5,4 @@ QT = core wince*mips*|wincewm50smart-msvc200*: DEFINES += WINCE_BROKEN_ITERATE=1 +CONFIG += parallel_test |