diff options
| author | Martin Jones <martin.jones@nokia.com> | 2009-12-11 04:02:12 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2009-12-11 04:02:12 (GMT) |
| commit | 950a09098252c0607376170d7909ef33a4f264ab (patch) | |
| tree | 512dac052f2b9e702af19705dd30df42fa6352f4 /tests/auto/auto.pro | |
| parent | 3051067a661db92c77f9cf8c31d3231174a6a475 (diff) | |
| parent | 2935ec84073898ed4fe700f41ca108d420fb5ba9 (diff) | |
| download | Qt-950a09098252c0607376170d7909ef33a4f264ab.zip Qt-950a09098252c0607376170d7909ef33a4f264ab.tar.gz Qt-950a09098252c0607376170d7909ef33a4f264ab.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
src/declarative/util/qmlopenmetaobject.cpp
Diffstat (limited to 'tests/auto/auto.pro')
| -rw-r--r-- | tests/auto/auto.pro | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index 92d29ae..361ae8f 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -442,7 +442,6 @@ SUBDIRS += \ qsharedmemory \ qsidebar \ qsizegrip \ - qsoftkeymanager \ qsqldriver \ qsystemsemaphore \ qtconcurrentfilter \ @@ -477,6 +476,10 @@ embedded:!wince* { SUBDIRS += qtextpiecetable } +symbian { + SUBDIRS += qsoftkeymanager +} + # Enable the tests specific to QtXmlPatterns. If you add a test, remember to # update runQtXmlPatternsTests.sh too. Remember that this file, auto.pro, is # not respected by some test system, they just have a script which loop over |