Merge remote-tracking branch 'origin/5.3' into 5.4
authorFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Wed, 17 Dec 2014 11:49:35 +0000 (12:49 +0100)
committerFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Wed, 17 Dec 2014 11:49:35 +0000 (12:49 +0100)
commit7054b2b1d7a92bd1af05ee15bb1ce66c7fd51f73
treee41b9467804fdc6d6893203fd68ed3da25505284
parentf7c7c05bbd8f39626e9362c83d17164911ef5d6f
parent8a7156c2f9a409fa741dd9e013407169211fb5ed
Merge remote-tracking branch 'origin/5.3' into 5.4

Change-Id: I078c03570399f5212b660b7ed29d3e45ed995896
src/serialport/qserialport_win.cpp