diff options
| author | Denis Shienkov <denis.shienkov@gmail.com> | 2013-04-19 16:30:46 +0400 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-04-21 16:37:01 +0200 |
| commit | 5cca18d3c02869411a92011a76f5b05deba1ffc2 (patch) | |
| tree | 5507306c85cb4813dd0566103ac811dc65a3d262 | |
| parent | 3bfe998860e0bfd3ce48784188eaa0d58bf86da1 (diff) | |
| download | qtserialport-5cca18d3c02869411a92011a76f5b05deba1ffc2.tar.gz | |
Fix of errors of compilation on WinCE platform
Some previous commits entered regressions in compile process,
namely:
* sha1: 544f927c3724344d01d45d19151d236c143f8c83
After implementation of a new concept of internal architecture
of library, is entered regression for the indefinite eventMask
variable in the waitForReadOrWrite() method.
Solution - to define a variable into this method.
* sha1: 3ea635d74d4035c9036c2b7208b162620f51aa8b
Entered the name space regression for the class CommEventNotifier.
Solution - not to use a name space for this class.
Tested for target:
"-platform win32-msvc2005 -xplatform wincewm50pocket-msvc2005"
Task-number: QTPLAYGROUND-13
Change-Id: I9dbcc0023f06c1b0e6d7b1b670828650382ab785
Reviewed-by: Laszlo Papp <lpapp@kde.org>
| -rw-r--r-- | src/serialport/qserialport_wince.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/serialport/qserialport_wince.cpp b/src/serialport/qserialport_wince.cpp index 89fd592..07e3c67 100644 --- a/src/serialport/qserialport_wince.cpp +++ b/src/serialport/qserialport_wince.cpp @@ -211,7 +211,7 @@ bool QSerialPortPrivate::open(QIODevice::OpenMode mode) if (!updateCommTimeouts()) return false; - eventNotifier = new QSerialPort::CommEventNotifier(eventMask, this, q_ptr); + eventNotifier = new CommEventNotifier(eventMask, this, q_ptr); eventNotifier->start(); detectDefaultSettings(); @@ -426,6 +426,7 @@ bool QSerialPortPrivate::waitForReadOrWrite(bool *selectForRead, bool *selectFor bool checkRead, bool checkWrite, int msecs, bool *timedOut) { + DWORD eventMask = 0; // FIXME: Here the situation is not properly handled with zero timeout: // breaker can work out before you call a method WaitCommEvent() // and so it will loop forever! |