AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix tst_qfile build for WEC7.

Browse Source 
Windows Embedded Compact does not have drive letters like desktop
Windows => do not try to build drive letter related test code for WEC7.

Change-Id: I2c3659220a001510c0555e2dd773b4dd68e9c2cc
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
This commit is contained in:
Janne Anttila 2013-04-17 11:06:42 +03:00 committed by The Qt Project
parent 5a05d0716f
commit 428efd2ebe
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/auto/corelib/io/qfile/tst_qfile.cpp
View File

@ -1057,7 +1057,7 @@ void tst_QFile::ungetChar()
QCOMPARE(buf[2], '4'); QCOMPARE(buf[2], '4');
} }
#ifdef Q_OS_WIN #if defined(Q_OS_WIN) && !defined(Q_OS_WINCE)
QString driveLetters() QString driveLetters()
{ {
wchar_t volumeName[MAX_PATH]; wchar_t volumeName[MAX_PATH];
@ -1094,7 +1094,9 @@ void tst_QFile::invalidFile_data()
#if !defined(Q_OS_WIN) #if !defined(Q_OS_WIN)
QTest::newRow( "x11" ) << QString( "qwe//" ); QTest::newRow( "x11" ) << QString( "qwe//" );
#else #else
#if !defined(Q_OS_WINCE)
QTest::newRow( "colon2" ) << invalidDriveLetter() + QString::fromLatin1(":ail:invalid"); QTest::newRow( "colon2" ) << invalidDriveLetter() + QString::fromLatin1(":ail:invalid");
#endif
QTest::newRow( "colon3" ) << QString( ":failinvalid" ); QTest::newRow( "colon3" ) << QString( ":failinvalid" );
QTest::newRow( "forwardslash" ) << QString( "fail/invalid" ); QTest::newRow( "forwardslash" ) << QString( "fail/invalid" );
QTest::newRow( "asterisk" ) << QString( "fail*invalid" ); QTest::newRow( "asterisk" ) << QString( "fail*invalid" );