diff options
author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-09-29 09:39:33 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-03 07:57:41 +0200 |
commit | f18b690cca2de6c75e70a2fd5871edf9fa993a5e (patch) | |
tree | 7884c18b46777aa0af313f4a1ee0993f82ba1152 /tests/auto/corelib/io/qfile | |
parent | c3d9d3698674a2240aa97403e3b684894d6f19db (diff) |
Tests: Fix compilation on Windows.
Replace Q_WS_... by Q_OS_... in corelib tests.
Change-Id: I14c41dca1ec490b3c49ba2c24e60def14c6de9da
Reviewed-on: http://codereview.qt-project.org/5778
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'tests/auto/corelib/io/qfile')
-rw-r--r-- | tests/auto/corelib/io/qfile/tst_qfile.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tests/auto/corelib/io/qfile/tst_qfile.cpp b/tests/auto/corelib/io/qfile/tst_qfile.cpp index c245661b14..9f8a8f7c6a 100644 --- a/tests/auto/corelib/io/qfile/tst_qfile.cpp +++ b/tests/auto/corelib/io/qfile/tst_qfile.cpp @@ -576,7 +576,7 @@ void tst_QFile::size() QFETCH( QString, filename ); QFETCH( qint64, size ); -#ifdef Q_WS_WINCE +#ifdef Q_OS_WINCE filename = QFileInfo(filename).absoluteFilePath(); #endif @@ -600,7 +600,7 @@ void tst_QFile::size() } { -#ifdef Q_WS_WINCE +#ifdef Q_OS_WINCE QSKIP("Currently low level file I/O not well supported on Windows CE", SkipSingle); #endif QFile f; @@ -1042,7 +1042,7 @@ void tst_QFile::ungetChar() void tst_QFile::invalidFile_data() { QTest::addColumn<QString>("fileName"); -#if !defined(Q_WS_WIN) +#if !defined(Q_OS_WIN) QTest::newRow( "x11" ) << QString( "qwe//" ); #else QTest::newRow( "colon1" ) << QString( "fail:invalid" ); @@ -1225,7 +1225,7 @@ void tst_QFile::copyFallback() QVERIFY(QFile::exists("file-copy-destination.txt")); QVERIFY(!file.isOpen()); -#ifdef Q_WS_WINCE +#ifdef Q_OS_WINCE // Need to reset permissions on Windows to be able to delete QVERIFY(QFile::setPermissions("file-copy-destination.txt", QFile::WriteOther)); @@ -1801,7 +1801,7 @@ void tst_QFile::largeFileSupport() sizeNeeded *= 2; sizeNeeded += 1024; qlonglong freespace = qlonglong(0); -#ifdef Q_WS_WIN +#ifdef Q_OS_WIN _ULARGE_INTEGER free; if (::GetDiskFreeSpaceEx((wchar_t*)QDir::currentPath().utf16(), &free, 0, 0)) freespace = free.QuadPart; @@ -2793,7 +2793,7 @@ void tst_QFile::map() QString fileName = QDir::currentPath() + '/' + "qfile_map_testfile"; -#ifdef Q_WS_WINCE +#ifdef Q_OS_WINCE fileName = QFileInfo(fileName).absoluteFilePath(); #endif @@ -2994,7 +2994,7 @@ void tst_QFile::openDirectory() void tst_QFile::openStandardStreamsFileDescriptors() { -#ifdef Q_WS_WINCE +#ifdef Q_OS_WINCE //allthough Windows CE (not mobile!) has functions that allow redirecting //the standard file descriptors to a file (see SetStdioPathW/GetStdioPathW) //it does not have functions to simply open them like below . |