summaryrefslogtreecommitdiff
path: root/src/serialport/qserialportinfo_win.cpp
diff options
context:
space:
mode:
authorDenis Shienkov <denis.shienkov@gmail.com>2014-05-05 17:43:54 +0400
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-05-20 20:26:03 +0200
commitd27ce6689855550ff89c5f84d38bded3c3da1dca (patch)
treec2d39ee4dc2fe05a3e7313d92278dc54cb07c136 /src/serialport/qserialportinfo_win.cpp
parentc74b2e2336662c9f0b5fb01b979b93ea0b99803d (diff)
downloadqtserialport-d27ce6689855550ff89c5f84d38bded3c3da1dca.tar.gz
Move the WinCE implementation into separate module
WinCE implementation was mixed a common code with the Win32 implementation that caused some problems with maintenance. More correct decision is moving a common code which was used in *win.cpp into *wince.cpp module without modifications. Now the Win32 and the WinCE implementation are independent from each other. Tested build with Qt5 on "win32-msvc2012" and then with Qt4 on "wincewm50pocket-msvc2008" configurations. Change-Id: I63f687468beffa9a75b534a4fbe536b854b12210 Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Diffstat (limited to 'src/serialport/qserialportinfo_win.cpp')
-rw-r--r--src/serialport/qserialportinfo_win.cpp6
1 files changed, 0 insertions, 6 deletions
diff --git a/src/serialport/qserialportinfo_win.cpp b/src/serialport/qserialportinfo_win.cpp
index 448f3ed..8e449c4 100644
--- a/src/serialport/qserialportinfo_win.cpp
+++ b/src/serialport/qserialportinfo_win.cpp
@@ -45,19 +45,15 @@
#include "qserialportinfo_p.h"
#include "qserialport_win_p.h"
-#ifndef Q_OS_WINCE
#include <QtCore/quuid.h>
#include <QtCore/qpair.h>
#include <QtCore/qstringlist.h>
#include <initguid.h>
#include <setupapi.h>
-#endif
QT_BEGIN_NAMESPACE
-#ifndef Q_OS_WINCE
-
typedef QPair<QUuid, DWORD> GuidFlagsPair;
static inline const QList<GuidFlagsPair>& guidFlagsPairs()
@@ -302,8 +298,6 @@ QList<QSerialPortInfo> QSerialPortInfo::availablePorts()
return serialPortInfoList;
}
-#endif
-
QList<qint32> QSerialPortInfo::standardBaudRates()
{
return QSerialPortPrivate::standardBaudRates();