diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-30 09:01:55 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-30 09:01:55 (GMT) |
commit | 917102fedeef6a22237fd426c28268856984965e (patch) | |
tree | dc34bfe1caed990e2ef85311ad28c9fdde5eb192 /tests | |
parent | 9a23f377b38a2e65da9b67982d7ca770dbcc16b0 (diff) | |
parent | 2edaa9e52da494703df219a6b7672e0a33fc7031 (diff) | |
download | Qt-917102fedeef6a22237fd426c28268856984965e.zip Qt-917102fedeef6a22237fd426c28268856984965e.tar.gz Qt-917102fedeef6a22237fd426c28268856984965e.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Corrected case mismatch.
Fixed pro file syntax in demos/spectrum
Fix for failing autotest QToolBar/Symbian
Removed useless Exit button in Symbian^3
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/qdir/qdir.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/qdir/qdir.pro b/tests/auto/qdir/qdir.pro index cf612f1..d81e428 100644 --- a/tests/auto/qdir/qdir.pro +++ b/tests/auto/qdir/qdir.pro @@ -4,7 +4,7 @@ RESOURCES += qdir.qrc QT = core wince*|symbian { - DirFiles.sources = testdir testdata searchdir resources entrylist types tst_qdir.cpp + DirFiles.sources = testdir testData searchdir resources entrylist types tst_qdir.cpp DirFiles.path = . DEPLOYMENT += DirFiles } |