Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt into qtwebkit-4.6-staging

Conflicts:
	util/webkit/mkdist-webkit

1 files changed, 6 insertions, 5 deletions

diff --git a/src/gui/embedded/qmousevr41xx_qws.cpp b/src/gui/embedded/qmousevr41xx_qws.cpp
index 8748055..b7491d9 100644
--- a/src/gui/embedded/qmousevr41xx_qws.cpp
+++ b/src/gui/embedded/qmousevr41xx_qws.cpp
@@ -49,6 +49,7 @@
 #include "qscreen_qws.h"
 #include <qstringlist.h>
 #include <qvarlengtharray.h>
+#include <private/qcore_unix_p.h> // overrides QT_OPEN
 
 #include <unistd.h>
 #include <stdlib.h>
@@ -144,7 +145,7 @@ QWSVr41xxMouseHandlerPrivate::QWSVr41xxMouseHandlerPrivate(QWSVr41xxMouseHandler
     else
         dev = options.first();
 
-    if ((mouseFD = open(dev.toLocal8Bit().constData(), O_RDONLY)) < 0) {
+    if ((mouseFD = QT_OPEN(dev.toLocal8Bit().constData(), O_RDONLY)) < 0) {
         qWarning("Cannot open %s (%s)", qPrintable(dev), strerror(errno));
         return;
     }
@@ -167,7 +168,7 @@ QWSVr41xxMouseHandlerPrivate::QWSVr41xxMouseHandlerPrivate(QWSVr41xxMouseHandler
 QWSVr41xxMouseHandlerPrivate::~QWSVr41xxMouseHandlerPrivate()
 {
     if (mouseFD >= 0)
-        close(mouseFD);
+        QT_CLOSE(mouseFD);
 }
 
 void QWSVr41xxMouseHandlerPrivate::suspend()
@@ -190,9 +191,9 @@ void QWSVr41xxMouseHandlerPrivate::sendRelease()
 
 bool QWSVr41xxMouseHandlerPrivate::getSample()
 {
-    const int n = read(mouseFD,
-                       reinterpret_cast<uchar*>(currSample) + currLength,
-                       sizeof(currSample) - currLength);
+    const int n = QT_READ(mouseFD,
+                          reinterpret_cast<uchar*>(currSample) + currLength,
+                          sizeof(currSample) - currLength);
 
     if (n > 0)
         currLength += n;