delta/qt5/qtserialport.git - code.qt.io: qt/qtserialport.git

	Commit message (Collapse)	Author	Age	Files	Lines
*	Unify license header usage	Antti Kokko	2016-02-02	1	-5/+5
\| \| \| \| \| \| \| \|	Updated FDL license. Change-Id: I1165e025a7f9f3628d0bc25553b48d27384413ca Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com> Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
*	Merge remote-tracking branch 'origin/5.4' into 5.5	Frederik Gladhorn	2015-02-25	1	-6/+6
\| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: .qmake.conf src/serialport/qserialport_unix.cpp src/serialport/qserialport_unix_p.h src/serialport/qserialport_win.cpp src/serialport/qserialport_win_p.h src/serialport/qserialport_wince.cpp src/serialport/qserialport_wince_p.h Change-Id: Ibb917652b132e66fbb90f437bf762c1094911dc0
*	Doc: Fix the examples page	Topi Reinio	2015-01-20	1	-0/+45
	The group page listing all the examples defined also a \page name, which caused the generated page to contain no examples. Also correct the group name for Command Line Enumerator Example, and move the qtserialport-examples.qdoc to the correct location. Change-Id: I6ebfbe1c49d2a44e4ed631f22027659ba43ceb8d Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com> Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>