Fix qfile autotest build for WEC7
authorJanne Anttila <janne.anttila@digia.com>
Tue, 19 Jun 2012 08:11:13 +0000 (11:11 +0300)
committerQt by Nokia <qt-info@nokia.com>
Wed, 20 Jun 2012 22:58:16 +0000 (00:58 +0200)
Change-Id: I6c4b4c91ea841ccb91ad685510caaecaf51baced
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
tests/auto/corelib/io/qfile/test/test.pro
tests/auto/corelib/io/qfile/tst_qfile.cpp

index bd7792e..39f47a0 100644 (file)
@@ -3,6 +3,8 @@ CONFIG += parallel_test
 QT = core-private core network testlib
 TARGET = ../tst_qfile
 SOURCES = ../tst_qfile.cpp
+wince*: SOURCES += $$QT_SOURCE_TREE/src/corelib/kernel/qfunctions_wince.cpp
+
 RESOURCES += ../qfile.qrc ../rename-fallback.qrc ../copy-fallback.qrc
 
 TESTDATA += ../dosfile.txt ../noendofline.txt ../testfile.txt \
index 440cb83..ae80159 100644 (file)
@@ -3248,14 +3248,14 @@ void tst_QFile::autocloseHandle()
         //file is not closed, read should succeed
         char buf;
         QCOMPARE((int)QT_READ(fd_, &buf, 1), 1);
-        ::close(fd_);
+        QT_CLOSE(fd_);
         fd_ = -1;
     }
 
     {
         QFile file("readonlyfile");
         QVERIFY(openFile(file, QIODevice::ReadOnly, OpenStream, QFile::AutoCloseHandle));
-        int fd = fileno(stream_);
+        int fd = QT_FILENO(stream_);
         QCOMPARE(file.handle(), fd);
         file.close();
         stream_ = 0;
@@ -3270,7 +3270,7 @@ void tst_QFile::autocloseHandle()
     {
         QFile file("readonlyfile");
         QVERIFY(openFile(file, QIODevice::ReadOnly, OpenStream, QFile::DontCloseHandle));
-        QCOMPARE(file.handle(), fileno(stream_));
+        QCOMPARE(file.handle(), QT_FILENO(stream_));
         file.close();
         QCOMPARE(file.handle(), -1);
         //file is not closed, read should succeed