diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-07-01 19:24:01 +0200 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-07-01 19:24:01 +0200 |
| commit | 745ecfd8925716d962c97a4415881377faf6bdd5 (patch) | |
| tree | c4f78b3bd143af52372064cd3ba5c0ae440813c5 /tests/auto/corelib.pro | |
| parent | bda164303570629e44185e8baa52908ced6da301 (diff) | |
| parent | 8968c79c575755cdb52d5e615ed19e4529047464 (diff) | |
Merge remote branch 'origin/4.7' into qt-master-from-4.7
Conflicts:
bin/syncqt
src/gui/text/qtextlayout.cpp
tools/assistant/tools/assistant/helpviewer_qwv.cpp
tools/assistant/tools/assistant/helpviewer_qwv.h
tools/configure/configureapp.cpp
Diffstat (limited to 'tests/auto/corelib.pro')
| -rw-r--r-- | tests/auto/corelib.pro | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/tests/auto/corelib.pro b/tests/auto/corelib.pro index a7ab54d40b..d1d0940e88 100644 --- a/tests/auto/corelib.pro +++ b/tests/auto/corelib.pro @@ -102,3 +102,10 @@ SUBDIRS=\ selftests \ utf8 \ +symbian:SUBDIRS -= \ + qtconcurrentfilter \ + qtconcurrentiteratekernel \ + qtconcurrentmap \ + qtconcurrentrun \ + qtconcurrentthreadengine \ + |