diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-11-24 03:00:19 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-11-24 03:00:19 +0100 |
| commit | 72271c9160ed65dbf06668987e6241cbbc03f217 (patch) | |
| tree | a27aeb4b0b45a4703433556b37f8be0419d44a09 /src | |
| parent | 858ca50baf3cf0c1524ac4b6f714ce6ace1d345e (diff) | |
| parent | 4114f45fa8f4863a91c37ee06e93275d8b416853 (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: I35bc56c0e1bc2efa96c86c7a0a33322e72a4fdd9
Diffstat (limited to 'src')
| -rw-r--r-- | src/serialport/serialport-lib.pri | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/serialport/serialport-lib.pri b/src/serialport/serialport-lib.pri index bb12df27..ddd31f2b 100644 --- a/src/serialport/serialport-lib.pri +++ b/src/serialport/serialport-lib.pri @@ -19,7 +19,7 @@ SOURCES += \ $$PWD/qserialport.cpp \ $$PWD/qserialportinfo.cpp -win32:!wince* { +win32 { SOURCES += \ $$PWD/qserialport_win.cpp \ $$PWD/qserialportinfo_win.cpp \ |