diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-13 20:29:20 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-13 20:29:20 (GMT) |
| commit | c46c06d363b7c90fecd84e7ef333ffa449f1d71c (patch) | |
| tree | 17462ee1282075a748fa84ca0a0feca3e2c588a0 /tests/auto | |
| parent | 766791963b91bea53867381f04f72d356382a81b (diff) | |
| parent | ef84739c3737d03da9de2b5e92a68f70294c65d3 (diff) | |
| download | Qt-c46c06d363b7c90fecd84e7ef333ffa449f1d71c.zip Qt-c46c06d363b7c90fecd84e7ef333ffa449f1d71c.tar.gz Qt-c46c06d363b7c90fecd84e7ef333ffa449f1d71c.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:
Fix qmake.pro after Symbian alternate build system integration
Fix compile error
Don't try to use so much permissions, use something a lot more sane
A bit saner suggestion
Remove not needed permissions
Make compile on Symbian
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/qchar/qchar.pro | 6 | ||||
| -rw-r--r-- | tests/auto/qchar/tst_qchar.cpp | 5 |
2 files changed, 6 insertions, 5 deletions
diff --git a/tests/auto/qchar/qchar.pro b/tests/auto/qchar/qchar.pro index 0a3fcc3..a534d14 100644 --- a/tests/auto/qchar/qchar.pro +++ b/tests/auto/qchar/qchar.pro @@ -8,4 +8,8 @@ deploy.sources += NormalizationTest.txt DEPLOYMENT = deploy } -DEFINES += SRCDIR=\\\"$$PWD/\\\" +symbian*: { + DEFINES += SRCDIR="" +} else { + DEFINES += SRCDIR=\\\"$$PWD/\\\" +} diff --git a/tests/auto/qchar/tst_qchar.cpp b/tests/auto/qchar/tst_qchar.cpp index 6227c2e..5ca2255 100644 --- a/tests/auto/qchar/tst_qchar.cpp +++ b/tests/auto/qchar/tst_qchar.cpp @@ -513,10 +513,7 @@ void tst_QChar::normalization() } QFile f(SRCDIR "NormalizationTest.txt"); - if (!f.exists()) { - QFAIL("Couldn't find NormalizationTest.txt"); - return; - } + QVERIFY(f.exists()); f.open(QIODevice::ReadOnly); |