summaryrefslogtreecommitdiffstats
path: root/src/serialport/serialport-lib.pri
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/serialport-lib.pri
parentc74b2e2336662c9f0b5fb01b979b93ea0b99803d (diff)
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/serialport-lib.pri')
-rw-r--r--src/serialport/serialport-lib.pri19
1 files changed, 11 insertions, 8 deletions
diff --git a/src/serialport/serialport-lib.pri b/src/serialport/serialport-lib.pri
index b228d018..166a6fac 100644
--- a/src/serialport/serialport-lib.pri
+++ b/src/serialport/serialport-lib.pri
@@ -29,7 +29,7 @@ SOURCES += \
$$PWD/qserialport.cpp \
$$PWD/qserialportinfo.cpp
-win32 {
+win32:!wince* {
PRIVATE_HEADERS += \
$$PWD/qserialport_win_p.h
@@ -37,13 +37,16 @@ win32 {
$$PWD/qserialport_win.cpp \
$$PWD/qserialportinfo_win.cpp
- !wince*: {
- LIBS_PRIVATE += -lsetupapi -ladvapi32
- } else {
- SOURCES += \
- $$PWD/qserialport_wince.cpp \
- $$PWD/qserialportinfo_wince.cpp
- }
+ LIBS_PRIVATE += -lsetupapi -ladvapi32
+}
+
+wince* {
+ PRIVATE_HEADERS += \
+ $$PWD/qserialport_wince_p.h
+
+ SOURCES += \
+ $$PWD/qserialport_wince.cpp \
+ $$PWD/qserialportinfo_wince.cpp
}
symbian {