diff options
| author | Joerg Bornemann <joerg.bornemann@nokia.com> | 2009-11-10 16:00:26 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2009-11-11 17:34:36 (GMT) |
| commit | 86fe91389b1f69575ab27cf1ae459d983bfb8cab (patch) | |
| tree | 331ff8e033430916072693f95994951180bb3b10 | |
| parent | 5f8c83668f7d90115d7d8c59fce897e9968d4d13 (diff) | |
| download | Qt-86fe91389b1f69575ab27cf1ae459d983bfb8cab.zip Qt-86fe91389b1f69575ab27cf1ae459d983bfb8cab.tar.gz Qt-86fe91389b1f69575ab27cf1ae459d983bfb8cab.tar.bz2 | |
fix tst_qdatastream for Windows CE
SRCDIR is empty on Windows CE, so it doesn't make sense to prepend a
slash. No other autotest does this.
Also, we must deploy test2.svg.
Reviewed-by: thartman
| -rw-r--r-- | tests/auto/qdatastream/qdatastream.pro | 2 | ||||
| -rw-r--r-- | tests/auto/qdatastream/tst_qdatastream.cpp | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/tests/auto/qdatastream/qdatastream.pro b/tests/auto/qdatastream/qdatastream.pro index 5b90357..c132073 100644 --- a/tests/auto/qdatastream/qdatastream.pro +++ b/tests/auto/qdatastream/qdatastream.pro @@ -12,7 +12,7 @@ QT += svg wince*: { - addFiles.sources = datastream.q42 gearflowers.svg + addFiles.sources = datastream.q42 tests2.svg addFiles.path = . DEPLOYMENT += addFiles DEFINES += SRCDIR=\\\"\\\" diff --git a/tests/auto/qdatastream/tst_qdatastream.cpp b/tests/auto/qdatastream/tst_qdatastream.cpp index 7535645..24447ea 100644 --- a/tests/auto/qdatastream/tst_qdatastream.cpp +++ b/tests/auto/qdatastream/tst_qdatastream.cpp @@ -320,8 +320,7 @@ void tst_QDataStream::getSetCheck() tst_QDataStream::tst_QDataStream() { - svgFile = QLatin1String(SRCDIR) + QLatin1String("/") + - QLatin1String(SVGFILE); + svgFile = QLatin1String(SRCDIR SVGFILE); } tst_QDataStream::~tst_QDataStream() |