diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2010-08-05 12:53:44 (GMT) |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2010-08-06 07:46:01 (GMT) |
| commit | bba4b0caa9865ee021a3e477e1bb861c56000f68 (patch) | |
| tree | 0951e3f9791f931e3a3b9cbdbfa561b51b6f75a2 /tests/auto/qtextcodec | |
| parent | 64ca5d3ac1dc1b1e82c409cf011d97ca8f76f6ed (diff) | |
| download | Qt-bba4b0caa9865ee021a3e477e1bb861c56000f68.zip Qt-bba4b0caa9865ee021a3e477e1bb861c56000f68.tar.gz Qt-bba4b0caa9865ee021a3e477e1bb861c56000f68.tar.bz2 | |
Fix duplicate binary names issues in Symbian autotests
In Symbian each binary name must be unique as all binaries are stored
in the same directory on the device. Some autotests created helper
binaries that had same names on different tests, which caused
build and installation issues when building entire autotest project
tree.
Reviewed-by: Shane Kearns
Diffstat (limited to 'tests/auto/qtextcodec')
| -rw-r--r-- | tests/auto/qtextcodec/qtextcodec.pro | 2 | ||||
| -rw-r--r-- | tests/auto/qtextcodec/tst_qtextcodec.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/tests/auto/qtextcodec/qtextcodec.pro b/tests/auto/qtextcodec/qtextcodec.pro index 0bcf067..6cb13a9 100644 --- a/tests/auto/qtextcodec/qtextcodec.pro +++ b/tests/auto/qtextcodec/qtextcodec.pro @@ -1,4 +1,4 @@ TEMPLATE = subdirs SUBDIRS = test -!wince*:SUBDIRS += echo +!wince*:!symbian:SUBDIRS += echo diff --git a/tests/auto/qtextcodec/tst_qtextcodec.cpp b/tests/auto/qtextcodec/tst_qtextcodec.cpp index 0946c93..cc41591 100644 --- a/tests/auto/qtextcodec/tst_qtextcodec.cpp +++ b/tests/auto/qtextcodec/tst_qtextcodec.cpp @@ -1946,6 +1946,8 @@ void tst_QTextCodec::toLocal8Bit() { #ifdef QT_NO_PROCESS QSKIP("This test requires QProcess", SkipAll); +#elif defined(Q_OS_SYMBIAN) + QSKIP("This test requires streams support in QProcess", SkipAll); #else QProcess process; process.start("echo/echo"); |