Merge remote-tracking branch 'origin/5.4' into 5.5

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

1 files changed, 45 insertions, 0 deletions

diff --git a/src/serialport/doc/src/qtserialport-examples.qdoc b/src/serialport/doc/src/qtserialport-examples.qdoc
new file mode 100644
index 00000000..1a04cfa9
--- /dev/null
+++ b/src/serialport/doc/src/qtserialport-examples.qdoc
@@ -0,0 +1,45 @@
+/****************************************************************************
+**
+** Copyright (C) 2011-2012 Denis Shienkov <denis.shienkov@gmail.com>
+** Copyright (C) 2012 Laszlo Papp <lpapp@kde.org>
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:FDL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Free Documentation License Usage
+** Alternatively, this file may be used under the terms of the GNU Free
+** Documentation License version 1.3 as published by the Free Software
+** Foundation and appearing in the file included in the packaging of
+** this file. Please review the following information to ensure
+** the GNU Free Documentation License version 1.3 requirements
+** will be met: http://www.gnu.org/copyleft/fdl.html.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \title Qt Serial Port Examples
+    \group qtserialport-examples
+    \brief List of serial port examples
+
+    The \l{Qt Serial Port} module provides the following examples for reference
+    to help understand the API usage.
+
+    \section1 Running the Examples
+
+    To run the examples from \l{Qt Creator Manual}{Qt Creator}, open the \gui
+    Welcome mode and select the example from \gui Examples.
+    For more information, visit
+    \l{Qt Creator: Building and Running an Example}{Building and Running an Example}.
+
+*/