Hello community,
here is the log from the commit of package libqt5-qtserialbus for
openSUSE:Factory checked in at 2017-12-15 14:04:30
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libqt5-qtserialbus (Old)
and /work/SRC/openSUSE:Factory/.libqt5-qtserialbus.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt5-qtserialbus"
Fri Dec 15 14:04:30 2017 rev:5 rq:545955 version:5.9.3
Changes:
--------
--- /work/SRC/openSUSE:Factory/libqt5-qtserialbus/libqt5-qtserialbus.changes
2017-10-24 22:22:37.202539509 +0200
+++
/work/SRC/openSUSE:Factory/.libqt5-qtserialbus.new/libqt5-qtserialbus.changes
2017-12-15 14:04:31.051130165 +0100
@@ -1,0 +2,8 @@
+Sat Nov 25 12:46:45 UTC 2017 - [email protected]
+
+- Update to 5.9.3
+ * New bugfix release
+ * For more details, see:
+ http://code.qt.io/cgit/qt/qtserialbus.git/tree/dist/changes-5.9.3/?h=v5.9.3
+
+-------------------------------------------------------------------
Old:
----
qtserialbus-opensource-src-5.9.2.tar.xz
New:
----
qtserialbus-opensource-src-5.9.3.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libqt5-qtserialbus.spec ++++++
--- /var/tmp/diff_new_pack.fnJNG6/_old 2017-12-15 14:04:31.731097340 +0100
+++ /var/tmp/diff_new_pack.fnJNG6/_new 2017-12-15 14:04:31.731097340 +0100
@@ -19,15 +19,15 @@
%define qt5_snapshot 0
Name: libqt5-qtserialbus
-Version: 5.9.2
+Version: 5.9.3
Release: 0
Summary: Qt 5 Serial Bus Addon
License: SUSE-LGPL-2.1-with-digia-exception-1.1 or GPL-3.0
Group: Development/Libraries/X11
Url: https://www.qt.io
%define base_name libqt5
-%define real_version 5.9.2
-%define so_version 5.9.2
+%define real_version 5.9.3
+%define so_version 5.9.3
%define tar_version qtserialbus-opensource-src-%{real_version}
Source:
https://download.qt.io/official_releases/qt/5.9/%{real_version}/submodules/%{tar_version}.tar.xz
Source1: baselibs.conf
++++++ qtserialbus-opensource-src-5.9.2.tar.xz ->
qtserialbus-opensource-src-5.9.3.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtserialbus-opensource-src-5.9.2/.qmake.conf
new/qtserialbus-opensource-src-5.9.3/.qmake.conf
--- old/qtserialbus-opensource-src-5.9.2/.qmake.conf 2017-09-22
11:29:57.000000000 +0200
+++ new/qtserialbus-opensource-src-5.9.3/.qmake.conf 2017-11-08
08:55:29.000000000 +0100
@@ -2,4 +2,4 @@
CONFIG += warning_clean
DEFINES += QT_NO_FOREACH
-MODULE_VERSION = 5.9.2
+MODULE_VERSION = 5.9.3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtserialbus-opensource-src-5.9.2/.tag
new/qtserialbus-opensource-src-5.9.3/.tag
--- old/qtserialbus-opensource-src-5.9.2/.tag 2017-09-22 11:29:57.000000000
+0200
+++ new/qtserialbus-opensource-src-5.9.3/.tag 2017-11-08 08:55:29.000000000
+0100
@@ -1 +1 @@
-ce5a3ced5eeefe05675736d3279d4d45bbb6df90
+43845adcb402b2a55cac423b142a9139b4cac17d
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtserialbus-opensource-src-5.9.2/dist/changes-5.9.3
new/qtserialbus-opensource-src-5.9.3/dist/changes-5.9.3
--- old/qtserialbus-opensource-src-5.9.2/dist/changes-5.9.3 1970-01-01
01:00:00.000000000 +0100
+++ new/qtserialbus-opensource-src-5.9.3/dist/changes-5.9.3 2017-11-08
08:55:29.000000000 +0100
@@ -0,0 +1,40 @@
+Qt 5.9.3 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.9.0.
+
+For more details, refer to the online documentation included in this
+distribution. The documentation is also available online:
+
+http://doc.qt.io/qt-5/index.html
+
+The Qt version 5.9 series is binary compatible with the 5.8.x series.
+Applications compiled for 5.8 will continue to run with 5.9.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+https://bugreports.qt.io/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+****************************************************************************
+* Qt 5.9.3 Changes *
+****************************************************************************
+
+QtSerialBus
+------
+
+ - SystecCAN:
+ * [QTBUG-63833] Fixed that availableDevices() could return
+ wrong device numbers.
+ * Fixed that availableDevices() did only return the first two
+ channels of the first device.
+
+ - PeakCAN:
+ * [QTBUG-63428] Fixed that connect() always returned false
+ under Linux.
+ * Peak status frames are no longer wrongly converted into
+ QCanBusFrame::DataFrame, they are simply dropped for now.
+ In a later Qt version they might by converted into proper
+ QCanBusFrame::ErrorFrame, together with an interpretErrorFrame()
+ implementation.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialbus-opensource-src-5.9.2/examples/serialbus/can/bitratebox.cpp
new/qtserialbus-opensource-src-5.9.3/examples/serialbus/can/bitratebox.cpp
--- old/qtserialbus-opensource-src-5.9.2/examples/serialbus/can/bitratebox.cpp
2017-09-22 11:29:57.000000000 +0200
+++ new/qtserialbus-opensource-src-5.9.3/examples/serialbus/can/bitratebox.cpp
2017-11-08 08:55:29.000000000 +0100
@@ -1,12 +1,22 @@
/****************************************************************************
**
** Copyright (C) 2017 Andre Hartmann <[email protected]>
-** Contact: http://www.qt.io/licensing/
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the QtSerialBus module.
**
** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** 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 https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialbus-opensource-src-5.9.2/examples/serialbus/can/bitratebox.h
new/qtserialbus-opensource-src-5.9.3/examples/serialbus/can/bitratebox.h
--- old/qtserialbus-opensource-src-5.9.2/examples/serialbus/can/bitratebox.h
2017-09-22 11:29:57.000000000 +0200
+++ new/qtserialbus-opensource-src-5.9.3/examples/serialbus/can/bitratebox.h
2017-11-08 08:55:29.000000000 +0100
@@ -1,12 +1,22 @@
/****************************************************************************
**
** Copyright (C) 2017 Andre Hartmann <[email protected]>
-** Contact: http://www.qt.io/licensing/
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the QtSerialBus module.
**
** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** 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 https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialbus-opensource-src-5.9.2/examples/serialbus/can/connectdialog.cpp
new/qtserialbus-opensource-src-5.9.3/examples/serialbus/can/connectdialog.cpp
---
old/qtserialbus-opensource-src-5.9.2/examples/serialbus/can/connectdialog.cpp
2017-09-22 11:29:57.000000000 +0200
+++
new/qtserialbus-opensource-src-5.9.3/examples/serialbus/can/connectdialog.cpp
2017-11-08 08:55:29.000000000 +0100
@@ -1,12 +1,22 @@
/****************************************************************************
**
** Copyright (C) 2017 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the QtSerialBus module.
**
** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** 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 https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialbus-opensource-src-5.9.2/examples/serialbus/can/connectdialog.h
new/qtserialbus-opensource-src-5.9.3/examples/serialbus/can/connectdialog.h
--- old/qtserialbus-opensource-src-5.9.2/examples/serialbus/can/connectdialog.h
2017-09-22 11:29:57.000000000 +0200
+++ new/qtserialbus-opensource-src-5.9.3/examples/serialbus/can/connectdialog.h
2017-11-08 08:55:29.000000000 +0100
@@ -1,12 +1,22 @@
/****************************************************************************
**
** Copyright (C) 2017 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the QtSerialBus module.
**
** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** 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 https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialbus-opensource-src-5.9.2/examples/serialbus/can/main.cpp
new/qtserialbus-opensource-src-5.9.3/examples/serialbus/can/main.cpp
--- old/qtserialbus-opensource-src-5.9.2/examples/serialbus/can/main.cpp
2017-09-22 11:29:57.000000000 +0200
+++ new/qtserialbus-opensource-src-5.9.3/examples/serialbus/can/main.cpp
2017-11-08 08:55:29.000000000 +0100
@@ -1,12 +1,22 @@
/****************************************************************************
**
** Copyright (C) 2017 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the QtSerialBus module.
**
** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** 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 https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialbus-opensource-src-5.9.2/examples/serialbus/can/mainwindow.cpp
new/qtserialbus-opensource-src-5.9.3/examples/serialbus/can/mainwindow.cpp
--- old/qtserialbus-opensource-src-5.9.2/examples/serialbus/can/mainwindow.cpp
2017-09-22 11:29:57.000000000 +0200
+++ new/qtserialbus-opensource-src-5.9.3/examples/serialbus/can/mainwindow.cpp
2017-11-08 08:55:29.000000000 +0100
@@ -1,12 +1,22 @@
/****************************************************************************
**
** Copyright (C) 2017 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the QtSerialBus module.
**
** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** 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 https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialbus-opensource-src-5.9.2/examples/serialbus/can/mainwindow.h
new/qtserialbus-opensource-src-5.9.3/examples/serialbus/can/mainwindow.h
--- old/qtserialbus-opensource-src-5.9.2/examples/serialbus/can/mainwindow.h
2017-09-22 11:29:57.000000000 +0200
+++ new/qtserialbus-opensource-src-5.9.3/examples/serialbus/can/mainwindow.h
2017-11-08 08:55:29.000000000 +0100
@@ -1,12 +1,22 @@
/****************************************************************************
**
** Copyright (C) 2017 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the QtSerialBus module.
**
** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** 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 https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialbus-opensource-src-5.9.2/examples/serialbus/modbus/adueditor/main.cpp
new/qtserialbus-opensource-src-5.9.3/examples/serialbus/modbus/adueditor/main.cpp
---
old/qtserialbus-opensource-src-5.9.2/examples/serialbus/modbus/adueditor/main.cpp
2017-09-22 11:29:57.000000000 +0200
+++
new/qtserialbus-opensource-src-5.9.3/examples/serialbus/modbus/adueditor/main.cpp
2017-11-08 08:55:29.000000000 +0100
@@ -1,12 +1,22 @@
/****************************************************************************
**
** Copyright (C) 2017 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the QtSerialBus module.
**
** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** 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 https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialbus-opensource-src-5.9.2/examples/serialbus/modbus/adueditor/mainwindow.cpp
new/qtserialbus-opensource-src-5.9.3/examples/serialbus/modbus/adueditor/mainwindow.cpp
---
old/qtserialbus-opensource-src-5.9.2/examples/serialbus/modbus/adueditor/mainwindow.cpp
2017-09-22 11:29:57.000000000 +0200
+++
new/qtserialbus-opensource-src-5.9.3/examples/serialbus/modbus/adueditor/mainwindow.cpp
2017-11-08 08:55:29.000000000 +0100
@@ -1,12 +1,22 @@
/****************************************************************************
**
** Copyright (C) 2017 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the QtSerialBus module.
**
** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** 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 https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialbus-opensource-src-5.9.2/examples/serialbus/modbus/adueditor/mainwindow.h
new/qtserialbus-opensource-src-5.9.3/examples/serialbus/modbus/adueditor/mainwindow.h
---
old/qtserialbus-opensource-src-5.9.2/examples/serialbus/modbus/adueditor/mainwindow.h
2017-09-22 11:29:57.000000000 +0200
+++
new/qtserialbus-opensource-src-5.9.3/examples/serialbus/modbus/adueditor/mainwindow.h
2017-11-08 08:55:29.000000000 +0100
@@ -1,12 +1,22 @@
/****************************************************************************
**
** Copyright (C) 2017 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the QtSerialBus module.
**
** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** 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 https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialbus-opensource-src-5.9.2/examples/serialbus/modbus/adueditor/modbustcpclient.cpp
new/qtserialbus-opensource-src-5.9.3/examples/serialbus/modbus/adueditor/modbustcpclient.cpp
---
old/qtserialbus-opensource-src-5.9.2/examples/serialbus/modbus/adueditor/modbustcpclient.cpp
2017-09-22 11:29:57.000000000 +0200
+++
new/qtserialbus-opensource-src-5.9.3/examples/serialbus/modbus/adueditor/modbustcpclient.cpp
2017-11-08 08:55:29.000000000 +0100
@@ -1,12 +1,22 @@
/****************************************************************************
**
** Copyright (C) 2017 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the QtSerialBus module.
**
** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** 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 https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialbus-opensource-src-5.9.2/examples/serialbus/modbus/adueditor/modbustcpclient.h
new/qtserialbus-opensource-src-5.9.3/examples/serialbus/modbus/adueditor/modbustcpclient.h
---
old/qtserialbus-opensource-src-5.9.2/examples/serialbus/modbus/adueditor/modbustcpclient.h
2017-09-22 11:29:57.000000000 +0200
+++
new/qtserialbus-opensource-src-5.9.3/examples/serialbus/modbus/adueditor/modbustcpclient.h
2017-11-08 08:55:29.000000000 +0100
@@ -1,12 +1,22 @@
/****************************************************************************
**
** Copyright (C) 2017 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the QtSerialBus module.
**
** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** 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 https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialbus-opensource-src-5.9.2/examples/serialbus/modbus/adueditor/modbustcpclient_p.h
new/qtserialbus-opensource-src-5.9.3/examples/serialbus/modbus/adueditor/modbustcpclient_p.h
---
old/qtserialbus-opensource-src-5.9.2/examples/serialbus/modbus/adueditor/modbustcpclient_p.h
2017-09-22 11:29:57.000000000 +0200
+++
new/qtserialbus-opensource-src-5.9.3/examples/serialbus/modbus/adueditor/modbustcpclient_p.h
2017-11-08 08:55:29.000000000 +0100
@@ -1,12 +1,22 @@
/****************************************************************************
**
** Copyright (C) 2017 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the QtSerialBus module.
**
** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** 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 https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialbus-opensource-src-5.9.2/examples/serialbus/modbus/adueditor/plaintextedit.h
new/qtserialbus-opensource-src-5.9.3/examples/serialbus/modbus/adueditor/plaintextedit.h
---
old/qtserialbus-opensource-src-5.9.2/examples/serialbus/modbus/adueditor/plaintextedit.h
2017-09-22 11:29:57.000000000 +0200
+++
new/qtserialbus-opensource-src-5.9.3/examples/serialbus/modbus/adueditor/plaintextedit.h
2017-11-08 08:55:29.000000000 +0100
@@ -1,12 +1,22 @@
/****************************************************************************
**
** Copyright (C) 2017 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the QtSerialBus module.
**
** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** 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 https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialbus-opensource-src-5.9.2/examples/serialbus/modbus/master/doc/src/modbusmaster.qdoc
new/qtserialbus-opensource-src-5.9.3/examples/serialbus/modbus/master/doc/src/modbusmaster.qdoc
---
old/qtserialbus-opensource-src-5.9.2/examples/serialbus/modbus/master/doc/src/modbusmaster.qdoc
2017-09-22 11:29:57.000000000 +0200
+++
new/qtserialbus-opensource-src-5.9.3/examples/serialbus/modbus/master/doc/src/modbusmaster.qdoc
2017-11-08 08:55:29.000000000 +0100
@@ -1,7 +1,7 @@
/****************************************************************************
**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2017 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the documentation of the Qt Toolkit.
**
@@ -11,8 +11,8 @@
** 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
**
** GNU Free Documentation License Usage
** Alternatively, this file may be used under the terms of the GNU Free
@@ -20,7 +20,7 @@
** 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.
+** will be met: https://www.gnu.org/licenses/fdl-1.3.html.
** $QT_END_LICENSE$
**
****************************************************************************/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialbus-opensource-src-5.9.2/examples/serialbus/modbus/master/main.cpp
new/qtserialbus-opensource-src-5.9.3/examples/serialbus/modbus/master/main.cpp
---
old/qtserialbus-opensource-src-5.9.2/examples/serialbus/modbus/master/main.cpp
2017-09-22 11:29:57.000000000 +0200
+++
new/qtserialbus-opensource-src-5.9.3/examples/serialbus/modbus/master/main.cpp
2017-11-08 08:55:29.000000000 +0100
@@ -1,12 +1,22 @@
/****************************************************************************
**
** Copyright (C) 2017 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the QtSerialBus module.
**
** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** 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 https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialbus-opensource-src-5.9.2/examples/serialbus/modbus/master/mainwindow.cpp
new/qtserialbus-opensource-src-5.9.3/examples/serialbus/modbus/master/mainwindow.cpp
---
old/qtserialbus-opensource-src-5.9.2/examples/serialbus/modbus/master/mainwindow.cpp
2017-09-22 11:29:57.000000000 +0200
+++
new/qtserialbus-opensource-src-5.9.3/examples/serialbus/modbus/master/mainwindow.cpp
2017-11-08 08:55:29.000000000 +0100
@@ -1,12 +1,22 @@
/****************************************************************************
**
** Copyright (C) 2017 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the QtSerialBus module.
**
** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** 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 https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialbus-opensource-src-5.9.2/examples/serialbus/modbus/master/mainwindow.h
new/qtserialbus-opensource-src-5.9.3/examples/serialbus/modbus/master/mainwindow.h
---
old/qtserialbus-opensource-src-5.9.2/examples/serialbus/modbus/master/mainwindow.h
2017-09-22 11:29:57.000000000 +0200
+++
new/qtserialbus-opensource-src-5.9.3/examples/serialbus/modbus/master/mainwindow.h
2017-11-08 08:55:29.000000000 +0100
@@ -1,12 +1,22 @@
/****************************************************************************
**
** Copyright (C) 2017 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the QtSerialBus module.
**
** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** 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 https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialbus-opensource-src-5.9.2/examples/serialbus/modbus/master/settingsdialog.cpp
new/qtserialbus-opensource-src-5.9.3/examples/serialbus/modbus/master/settingsdialog.cpp
---
old/qtserialbus-opensource-src-5.9.2/examples/serialbus/modbus/master/settingsdialog.cpp
2017-09-22 11:29:57.000000000 +0200
+++
new/qtserialbus-opensource-src-5.9.3/examples/serialbus/modbus/master/settingsdialog.cpp
2017-11-08 08:55:29.000000000 +0100
@@ -1,12 +1,22 @@
/****************************************************************************
**
** Copyright (C) 2017 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the QtSerialBus module.
**
** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** 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 https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialbus-opensource-src-5.9.2/examples/serialbus/modbus/master/settingsdialog.h
new/qtserialbus-opensource-src-5.9.3/examples/serialbus/modbus/master/settingsdialog.h
---
old/qtserialbus-opensource-src-5.9.2/examples/serialbus/modbus/master/settingsdialog.h
2017-09-22 11:29:57.000000000 +0200
+++
new/qtserialbus-opensource-src-5.9.3/examples/serialbus/modbus/master/settingsdialog.h
2017-11-08 08:55:29.000000000 +0100
@@ -1,12 +1,22 @@
/****************************************************************************
**
** Copyright (C) 2017 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the QtSerialBus module.
**
** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** 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 https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialbus-opensource-src-5.9.2/examples/serialbus/modbus/master/writeregistermodel.cpp
new/qtserialbus-opensource-src-5.9.3/examples/serialbus/modbus/master/writeregistermodel.cpp
---
old/qtserialbus-opensource-src-5.9.2/examples/serialbus/modbus/master/writeregistermodel.cpp
2017-09-22 11:29:57.000000000 +0200
+++
new/qtserialbus-opensource-src-5.9.3/examples/serialbus/modbus/master/writeregistermodel.cpp
2017-11-08 08:55:29.000000000 +0100
@@ -1,12 +1,22 @@
/****************************************************************************
**
** Copyright (C) 2017 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the QtSerialBus module.
**
** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** 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 https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialbus-opensource-src-5.9.2/examples/serialbus/modbus/master/writeregistermodel.h
new/qtserialbus-opensource-src-5.9.3/examples/serialbus/modbus/master/writeregistermodel.h
---
old/qtserialbus-opensource-src-5.9.2/examples/serialbus/modbus/master/writeregistermodel.h
2017-09-22 11:29:57.000000000 +0200
+++
new/qtserialbus-opensource-src-5.9.3/examples/serialbus/modbus/master/writeregistermodel.h
2017-11-08 08:55:29.000000000 +0100
@@ -1,12 +1,22 @@
/****************************************************************************
**
** Copyright (C) 2017 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the QtSerialBus module.
**
** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** 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 https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialbus-opensource-src-5.9.2/examples/serialbus/modbus/slave/doc/src/modbusslave.qdoc
new/qtserialbus-opensource-src-5.9.3/examples/serialbus/modbus/slave/doc/src/modbusslave.qdoc
---
old/qtserialbus-opensource-src-5.9.2/examples/serialbus/modbus/slave/doc/src/modbusslave.qdoc
2017-09-22 11:29:57.000000000 +0200
+++
new/qtserialbus-opensource-src-5.9.3/examples/serialbus/modbus/slave/doc/src/modbusslave.qdoc
2017-11-08 08:55:29.000000000 +0100
@@ -1,7 +1,7 @@
/****************************************************************************
**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2017 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the documentation of the Qt Toolkit.
**
@@ -11,8 +11,8 @@
** 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
**
** GNU Free Documentation License Usage
** Alternatively, this file may be used under the terms of the GNU Free
@@ -20,7 +20,7 @@
** 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.
+** will be met: https://www.gnu.org/licenses/fdl-1.3.html.
** $QT_END_LICENSE$
**
****************************************************************************/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialbus-opensource-src-5.9.2/examples/serialbus/modbus/slave/main.cpp
new/qtserialbus-opensource-src-5.9.3/examples/serialbus/modbus/slave/main.cpp
---
old/qtserialbus-opensource-src-5.9.2/examples/serialbus/modbus/slave/main.cpp
2017-09-22 11:29:57.000000000 +0200
+++
new/qtserialbus-opensource-src-5.9.3/examples/serialbus/modbus/slave/main.cpp
2017-11-08 08:55:29.000000000 +0100
@@ -1,12 +1,22 @@
/****************************************************************************
**
** Copyright (C) 2017 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the QtSerialBus module.
**
** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** 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 https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialbus-opensource-src-5.9.2/examples/serialbus/modbus/slave/mainwindow.cpp
new/qtserialbus-opensource-src-5.9.3/examples/serialbus/modbus/slave/mainwindow.cpp
---
old/qtserialbus-opensource-src-5.9.2/examples/serialbus/modbus/slave/mainwindow.cpp
2017-09-22 11:29:57.000000000 +0200
+++
new/qtserialbus-opensource-src-5.9.3/examples/serialbus/modbus/slave/mainwindow.cpp
2017-11-08 08:55:29.000000000 +0100
@@ -1,12 +1,22 @@
/****************************************************************************
**
** Copyright (C) 2017 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the QtSerialBus module.
**
** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** 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 https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialbus-opensource-src-5.9.2/examples/serialbus/modbus/slave/mainwindow.h
new/qtserialbus-opensource-src-5.9.3/examples/serialbus/modbus/slave/mainwindow.h
---
old/qtserialbus-opensource-src-5.9.2/examples/serialbus/modbus/slave/mainwindow.h
2017-09-22 11:29:57.000000000 +0200
+++
new/qtserialbus-opensource-src-5.9.3/examples/serialbus/modbus/slave/mainwindow.h
2017-11-08 08:55:29.000000000 +0100
@@ -1,12 +1,22 @@
/****************************************************************************
**
** Copyright (C) 2017 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the QtSerialBus module.
**
** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** 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 https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialbus-opensource-src-5.9.2/examples/serialbus/modbus/slave/settingsdialog.cpp
new/qtserialbus-opensource-src-5.9.3/examples/serialbus/modbus/slave/settingsdialog.cpp
---
old/qtserialbus-opensource-src-5.9.2/examples/serialbus/modbus/slave/settingsdialog.cpp
2017-09-22 11:29:57.000000000 +0200
+++
new/qtserialbus-opensource-src-5.9.3/examples/serialbus/modbus/slave/settingsdialog.cpp
2017-11-08 08:55:29.000000000 +0100
@@ -1,12 +1,22 @@
/****************************************************************************
**
** Copyright (C) 2017 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the QtSerialBus module.
**
** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** 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 https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialbus-opensource-src-5.9.2/examples/serialbus/modbus/slave/settingsdialog.h
new/qtserialbus-opensource-src-5.9.3/examples/serialbus/modbus/slave/settingsdialog.h
---
old/qtserialbus-opensource-src-5.9.2/examples/serialbus/modbus/slave/settingsdialog.h
2017-09-22 11:29:57.000000000 +0200
+++
new/qtserialbus-opensource-src-5.9.3/examples/serialbus/modbus/slave/settingsdialog.h
2017-11-08 08:55:29.000000000 +0100
@@ -1,12 +1,22 @@
/****************************************************************************
**
** Copyright (C) 2017 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the QtSerialBus module.
**
** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** 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 https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialbus-opensource-src-5.9.2/include/QtSerialBus/5.9.2/QtSerialBus/private/qcanbusdevice_p.h
new/qtserialbus-opensource-src-5.9.3/include/QtSerialBus/5.9.2/QtSerialBus/private/qcanbusdevice_p.h
---
old/qtserialbus-opensource-src-5.9.2/include/QtSerialBus/5.9.2/QtSerialBus/private/qcanbusdevice_p.h
2017-09-22 11:29:57.000000000 +0200
+++
new/qtserialbus-opensource-src-5.9.3/include/QtSerialBus/5.9.2/QtSerialBus/private/qcanbusdevice_p.h
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/serialbus/qcanbusdevice_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialbus-opensource-src-5.9.2/include/QtSerialBus/5.9.2/QtSerialBus/private/qcanbusdeviceinfo_p.h
new/qtserialbus-opensource-src-5.9.3/include/QtSerialBus/5.9.2/QtSerialBus/private/qcanbusdeviceinfo_p.h
---
old/qtserialbus-opensource-src-5.9.2/include/QtSerialBus/5.9.2/QtSerialBus/private/qcanbusdeviceinfo_p.h
2017-09-22 11:29:57.000000000 +0200
+++
new/qtserialbus-opensource-src-5.9.3/include/QtSerialBus/5.9.2/QtSerialBus/private/qcanbusdeviceinfo_p.h
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/serialbus/qcanbusdeviceinfo_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialbus-opensource-src-5.9.2/include/QtSerialBus/5.9.2/QtSerialBus/private/qmodbus_symbols_p.h
new/qtserialbus-opensource-src-5.9.3/include/QtSerialBus/5.9.2/QtSerialBus/private/qmodbus_symbols_p.h
---
old/qtserialbus-opensource-src-5.9.2/include/QtSerialBus/5.9.2/QtSerialBus/private/qmodbus_symbols_p.h
2017-09-22 11:29:57.000000000 +0200
+++
new/qtserialbus-opensource-src-5.9.3/include/QtSerialBus/5.9.2/QtSerialBus/private/qmodbus_symbols_p.h
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/serialbus/qmodbus_symbols_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialbus-opensource-src-5.9.2/include/QtSerialBus/5.9.2/QtSerialBus/private/qmodbusadu_p.h
new/qtserialbus-opensource-src-5.9.3/include/QtSerialBus/5.9.2/QtSerialBus/private/qmodbusadu_p.h
---
old/qtserialbus-opensource-src-5.9.2/include/QtSerialBus/5.9.2/QtSerialBus/private/qmodbusadu_p.h
2017-09-22 11:29:57.000000000 +0200
+++
new/qtserialbus-opensource-src-5.9.3/include/QtSerialBus/5.9.2/QtSerialBus/private/qmodbusadu_p.h
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/serialbus/qmodbusadu_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialbus-opensource-src-5.9.2/include/QtSerialBus/5.9.2/QtSerialBus/private/qmodbusclient_p.h
new/qtserialbus-opensource-src-5.9.3/include/QtSerialBus/5.9.2/QtSerialBus/private/qmodbusclient_p.h
---
old/qtserialbus-opensource-src-5.9.2/include/QtSerialBus/5.9.2/QtSerialBus/private/qmodbusclient_p.h
2017-09-22 11:29:57.000000000 +0200
+++
new/qtserialbus-opensource-src-5.9.3/include/QtSerialBus/5.9.2/QtSerialBus/private/qmodbusclient_p.h
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/serialbus/qmodbusclient_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialbus-opensource-src-5.9.2/include/QtSerialBus/5.9.2/QtSerialBus/private/qmodbuscommevent_p.h
new/qtserialbus-opensource-src-5.9.3/include/QtSerialBus/5.9.2/QtSerialBus/private/qmodbuscommevent_p.h
---
old/qtserialbus-opensource-src-5.9.2/include/QtSerialBus/5.9.2/QtSerialBus/private/qmodbuscommevent_p.h
2017-09-22 11:29:57.000000000 +0200
+++
new/qtserialbus-opensource-src-5.9.3/include/QtSerialBus/5.9.2/QtSerialBus/private/qmodbuscommevent_p.h
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/serialbus/qmodbuscommevent_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialbus-opensource-src-5.9.2/include/QtSerialBus/5.9.2/QtSerialBus/private/qmodbusdevice_p.h
new/qtserialbus-opensource-src-5.9.3/include/QtSerialBus/5.9.2/QtSerialBus/private/qmodbusdevice_p.h
---
old/qtserialbus-opensource-src-5.9.2/include/QtSerialBus/5.9.2/QtSerialBus/private/qmodbusdevice_p.h
2017-09-22 11:29:57.000000000 +0200
+++
new/qtserialbus-opensource-src-5.9.3/include/QtSerialBus/5.9.2/QtSerialBus/private/qmodbusdevice_p.h
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/serialbus/qmodbusdevice_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialbus-opensource-src-5.9.2/include/QtSerialBus/5.9.2/QtSerialBus/private/qmodbusrtuserialmaster_p.h
new/qtserialbus-opensource-src-5.9.3/include/QtSerialBus/5.9.2/QtSerialBus/private/qmodbusrtuserialmaster_p.h
---
old/qtserialbus-opensource-src-5.9.2/include/QtSerialBus/5.9.2/QtSerialBus/private/qmodbusrtuserialmaster_p.h
2017-09-22 11:29:57.000000000 +0200
+++
new/qtserialbus-opensource-src-5.9.3/include/QtSerialBus/5.9.2/QtSerialBus/private/qmodbusrtuserialmaster_p.h
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/serialbus/qmodbusrtuserialmaster_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialbus-opensource-src-5.9.2/include/QtSerialBus/5.9.2/QtSerialBus/private/qmodbusrtuserialslave_p.h
new/qtserialbus-opensource-src-5.9.3/include/QtSerialBus/5.9.2/QtSerialBus/private/qmodbusrtuserialslave_p.h
---
old/qtserialbus-opensource-src-5.9.2/include/QtSerialBus/5.9.2/QtSerialBus/private/qmodbusrtuserialslave_p.h
2017-09-22 11:29:57.000000000 +0200
+++
new/qtserialbus-opensource-src-5.9.3/include/QtSerialBus/5.9.2/QtSerialBus/private/qmodbusrtuserialslave_p.h
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/serialbus/qmodbusrtuserialslave_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialbus-opensource-src-5.9.2/include/QtSerialBus/5.9.2/QtSerialBus/private/qmodbusserver_p.h
new/qtserialbus-opensource-src-5.9.3/include/QtSerialBus/5.9.2/QtSerialBus/private/qmodbusserver_p.h
---
old/qtserialbus-opensource-src-5.9.2/include/QtSerialBus/5.9.2/QtSerialBus/private/qmodbusserver_p.h
2017-09-22 11:29:57.000000000 +0200
+++
new/qtserialbus-opensource-src-5.9.3/include/QtSerialBus/5.9.2/QtSerialBus/private/qmodbusserver_p.h
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/serialbus/qmodbusserver_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialbus-opensource-src-5.9.2/include/QtSerialBus/5.9.2/QtSerialBus/private/qmodbustcpclient_p.h
new/qtserialbus-opensource-src-5.9.3/include/QtSerialBus/5.9.2/QtSerialBus/private/qmodbustcpclient_p.h
---
old/qtserialbus-opensource-src-5.9.2/include/QtSerialBus/5.9.2/QtSerialBus/private/qmodbustcpclient_p.h
2017-09-22 11:29:57.000000000 +0200
+++
new/qtserialbus-opensource-src-5.9.3/include/QtSerialBus/5.9.2/QtSerialBus/private/qmodbustcpclient_p.h
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/serialbus/qmodbustcpclient_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialbus-opensource-src-5.9.2/include/QtSerialBus/5.9.2/QtSerialBus/private/qmodbustcpserver_p.h
new/qtserialbus-opensource-src-5.9.3/include/QtSerialBus/5.9.2/QtSerialBus/private/qmodbustcpserver_p.h
---
old/qtserialbus-opensource-src-5.9.2/include/QtSerialBus/5.9.2/QtSerialBus/private/qmodbustcpserver_p.h
2017-09-22 11:29:57.000000000 +0200
+++
new/qtserialbus-opensource-src-5.9.3/include/QtSerialBus/5.9.2/QtSerialBus/private/qmodbustcpserver_p.h
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/serialbus/qmodbustcpserver_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialbus-opensource-src-5.9.2/include/QtSerialBus/5.9.3/QtSerialBus/private/qcanbusdevice_p.h
new/qtserialbus-opensource-src-5.9.3/include/QtSerialBus/5.9.3/QtSerialBus/private/qcanbusdevice_p.h
---
old/qtserialbus-opensource-src-5.9.2/include/QtSerialBus/5.9.3/QtSerialBus/private/qcanbusdevice_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtserialbus-opensource-src-5.9.3/include/QtSerialBus/5.9.3/QtSerialBus/private/qcanbusdevice_p.h
2017-11-08 08:55:29.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/serialbus/qcanbusdevice_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialbus-opensource-src-5.9.2/include/QtSerialBus/5.9.3/QtSerialBus/private/qcanbusdeviceinfo_p.h
new/qtserialbus-opensource-src-5.9.3/include/QtSerialBus/5.9.3/QtSerialBus/private/qcanbusdeviceinfo_p.h
---
old/qtserialbus-opensource-src-5.9.2/include/QtSerialBus/5.9.3/QtSerialBus/private/qcanbusdeviceinfo_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtserialbus-opensource-src-5.9.3/include/QtSerialBus/5.9.3/QtSerialBus/private/qcanbusdeviceinfo_p.h
2017-11-08 08:55:29.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/serialbus/qcanbusdeviceinfo_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialbus-opensource-src-5.9.2/include/QtSerialBus/5.9.3/QtSerialBus/private/qmodbus_symbols_p.h
new/qtserialbus-opensource-src-5.9.3/include/QtSerialBus/5.9.3/QtSerialBus/private/qmodbus_symbols_p.h
---
old/qtserialbus-opensource-src-5.9.2/include/QtSerialBus/5.9.3/QtSerialBus/private/qmodbus_symbols_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtserialbus-opensource-src-5.9.3/include/QtSerialBus/5.9.3/QtSerialBus/private/qmodbus_symbols_p.h
2017-11-08 08:55:29.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/serialbus/qmodbus_symbols_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialbus-opensource-src-5.9.2/include/QtSerialBus/5.9.3/QtSerialBus/private/qmodbusadu_p.h
new/qtserialbus-opensource-src-5.9.3/include/QtSerialBus/5.9.3/QtSerialBus/private/qmodbusadu_p.h
---
old/qtserialbus-opensource-src-5.9.2/include/QtSerialBus/5.9.3/QtSerialBus/private/qmodbusadu_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtserialbus-opensource-src-5.9.3/include/QtSerialBus/5.9.3/QtSerialBus/private/qmodbusadu_p.h
2017-11-08 08:55:29.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/serialbus/qmodbusadu_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialbus-opensource-src-5.9.2/include/QtSerialBus/5.9.3/QtSerialBus/private/qmodbusclient_p.h
new/qtserialbus-opensource-src-5.9.3/include/QtSerialBus/5.9.3/QtSerialBus/private/qmodbusclient_p.h
---
old/qtserialbus-opensource-src-5.9.2/include/QtSerialBus/5.9.3/QtSerialBus/private/qmodbusclient_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtserialbus-opensource-src-5.9.3/include/QtSerialBus/5.9.3/QtSerialBus/private/qmodbusclient_p.h
2017-11-08 08:55:29.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/serialbus/qmodbusclient_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialbus-opensource-src-5.9.2/include/QtSerialBus/5.9.3/QtSerialBus/private/qmodbuscommevent_p.h
new/qtserialbus-opensource-src-5.9.3/include/QtSerialBus/5.9.3/QtSerialBus/private/qmodbuscommevent_p.h
---
old/qtserialbus-opensource-src-5.9.2/include/QtSerialBus/5.9.3/QtSerialBus/private/qmodbuscommevent_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtserialbus-opensource-src-5.9.3/include/QtSerialBus/5.9.3/QtSerialBus/private/qmodbuscommevent_p.h
2017-11-08 08:55:29.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/serialbus/qmodbuscommevent_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialbus-opensource-src-5.9.2/include/QtSerialBus/5.9.3/QtSerialBus/private/qmodbusdevice_p.h
new/qtserialbus-opensource-src-5.9.3/include/QtSerialBus/5.9.3/QtSerialBus/private/qmodbusdevice_p.h
---
old/qtserialbus-opensource-src-5.9.2/include/QtSerialBus/5.9.3/QtSerialBus/private/qmodbusdevice_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtserialbus-opensource-src-5.9.3/include/QtSerialBus/5.9.3/QtSerialBus/private/qmodbusdevice_p.h
2017-11-08 08:55:29.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/serialbus/qmodbusdevice_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialbus-opensource-src-5.9.2/include/QtSerialBus/5.9.3/QtSerialBus/private/qmodbusrtuserialmaster_p.h
new/qtserialbus-opensource-src-5.9.3/include/QtSerialBus/5.9.3/QtSerialBus/private/qmodbusrtuserialmaster_p.h
---
old/qtserialbus-opensource-src-5.9.2/include/QtSerialBus/5.9.3/QtSerialBus/private/qmodbusrtuserialmaster_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtserialbus-opensource-src-5.9.3/include/QtSerialBus/5.9.3/QtSerialBus/private/qmodbusrtuserialmaster_p.h
2017-11-08 08:55:29.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/serialbus/qmodbusrtuserialmaster_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialbus-opensource-src-5.9.2/include/QtSerialBus/5.9.3/QtSerialBus/private/qmodbusrtuserialslave_p.h
new/qtserialbus-opensource-src-5.9.3/include/QtSerialBus/5.9.3/QtSerialBus/private/qmodbusrtuserialslave_p.h
---
old/qtserialbus-opensource-src-5.9.2/include/QtSerialBus/5.9.3/QtSerialBus/private/qmodbusrtuserialslave_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtserialbus-opensource-src-5.9.3/include/QtSerialBus/5.9.3/QtSerialBus/private/qmodbusrtuserialslave_p.h
2017-11-08 08:55:29.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/serialbus/qmodbusrtuserialslave_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialbus-opensource-src-5.9.2/include/QtSerialBus/5.9.3/QtSerialBus/private/qmodbusserver_p.h
new/qtserialbus-opensource-src-5.9.3/include/QtSerialBus/5.9.3/QtSerialBus/private/qmodbusserver_p.h
---
old/qtserialbus-opensource-src-5.9.2/include/QtSerialBus/5.9.3/QtSerialBus/private/qmodbusserver_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtserialbus-opensource-src-5.9.3/include/QtSerialBus/5.9.3/QtSerialBus/private/qmodbusserver_p.h
2017-11-08 08:55:29.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/serialbus/qmodbusserver_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialbus-opensource-src-5.9.2/include/QtSerialBus/5.9.3/QtSerialBus/private/qmodbustcpclient_p.h
new/qtserialbus-opensource-src-5.9.3/include/QtSerialBus/5.9.3/QtSerialBus/private/qmodbustcpclient_p.h
---
old/qtserialbus-opensource-src-5.9.2/include/QtSerialBus/5.9.3/QtSerialBus/private/qmodbustcpclient_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtserialbus-opensource-src-5.9.3/include/QtSerialBus/5.9.3/QtSerialBus/private/qmodbustcpclient_p.h
2017-11-08 08:55:29.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/serialbus/qmodbustcpclient_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialbus-opensource-src-5.9.2/include/QtSerialBus/5.9.3/QtSerialBus/private/qmodbustcpserver_p.h
new/qtserialbus-opensource-src-5.9.3/include/QtSerialBus/5.9.3/QtSerialBus/private/qmodbustcpserver_p.h
---
old/qtserialbus-opensource-src-5.9.2/include/QtSerialBus/5.9.3/QtSerialBus/private/qmodbustcpserver_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtserialbus-opensource-src-5.9.3/include/QtSerialBus/5.9.3/QtSerialBus/private/qmodbustcpserver_p.h
2017-11-08 08:55:29.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/serialbus/qmodbustcpserver_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialbus-opensource-src-5.9.2/include/QtSerialBus/qtserialbusversion.h
new/qtserialbus-opensource-src-5.9.3/include/QtSerialBus/qtserialbusversion.h
---
old/qtserialbus-opensource-src-5.9.2/include/QtSerialBus/qtserialbusversion.h
2017-10-04 09:13:33.000000000 +0200
+++
new/qtserialbus-opensource-src-5.9.3/include/QtSerialBus/qtserialbusversion.h
2017-11-20 14:40:08.000000000 +0100
@@ -2,8 +2,8 @@
#ifndef QT_QTSERIALBUS_VERSION_H
#define QT_QTSERIALBUS_VERSION_H
-#define QTSERIALBUS_VERSION_STR "5.9.2"
+#define QTSERIALBUS_VERSION_STR "5.9.3"
-#define QTSERIALBUS_VERSION 0x050902
+#define QTSERIALBUS_VERSION 0x050903
#endif // QT_QTSERIALBUS_VERSION_H
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialbus-opensource-src-5.9.2/src/plugins/canbus/peakcan/peakcanbackend.cpp
new/qtserialbus-opensource-src-5.9.3/src/plugins/canbus/peakcan/peakcanbackend.cpp
---
old/qtserialbus-opensource-src-5.9.2/src/plugins/canbus/peakcan/peakcanbackend.cpp
2017-09-22 11:29:57.000000000 +0200
+++
new/qtserialbus-opensource-src-5.9.3/src/plugins/canbus/peakcan/peakcanbackend.cpp
2017-11-08 08:55:29.000000000 +0100
@@ -272,7 +272,6 @@
return false;
}
}
-#endif
const TPCANStatus err = ::CAN_SetValue(channelIndex, PCAN_RECEIVE_EVENT,
&readHandle, sizeof(readHandle));
if (Q_UNLIKELY(err != PCAN_ERROR_OK)) {
@@ -280,6 +279,14 @@
return false;
}
+#else
+ const TPCANStatus err = ::CAN_GetValue(channelIndex, PCAN_RECEIVE_EVENT,
&readHandle, sizeof(readHandle));
+ if (Q_UNLIKELY(err != PCAN_ERROR_OK)) {
+ q->setError(systemErrorString(err), QCanBusDevice::ConnectionError);
+ return false;
+ }
+#endif
+
writeNotifier = new WriteNotifier(this, q);
writeNotifier->setInterval(0);
@@ -413,6 +420,11 @@
break;
}
+ // Filter out PCAN status frames, to avoid turning them
+ // into QCanBusFrame::DataFrames with random canId
+ if (Q_UNLIKELY(message.MSGTYPE & PCAN_MESSAGE_STATUS))
+ continue;
+
QCanBusFrame frame(message.ID, QByteArray(reinterpret_cast<const char
*>(message.DATA), int(message.LEN)));
const quint64 millis = timestamp.millis + Q_UINT64_C(0xFFFFFFFF) *
timestamp.millis_overflow;
const quint64 micros = Q_UINT64_C(1000) * millis + timestamp.micros;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialbus-opensource-src-5.9.2/src/plugins/canbus/systeccan/systeccanbackend.cpp
new/qtserialbus-opensource-src-5.9.3/src/plugins/canbus/systeccan/systeccanbackend.cpp
---
old/qtserialbus-opensource-src-5.9.2/src/plugins/canbus/systeccan/systeccanbackend.cpp
2017-09-22 11:29:57.000000000 +0200
+++
new/qtserialbus-opensource-src-5.9.3/src/plugins/canbus/systeccan/systeccanbackend.cpp
2017-11-08 08:55:29.000000000 +0100
@@ -67,13 +67,14 @@
{
auto result = static_cast<QStringList *>(args);
+ Q_UNUSED(index);
Q_UNUSED(isUsed);
- Q_UNUSED(hardwareInfo);
- Q_UNUSED(initInfo);
- result->append(QString::fromLatin1("can%1.0").arg(index));
+
result->append(QString::fromLatin1("can%1.0").arg(hardwareInfo->m_bDeviceNr));
if (USBCAN_CHECK_SUPPORT_TWO_CHANNEL(hardwareInfo))
- result->append(QString::fromLatin1("can%1.1").arg(index));
+
result->append(QString::fromLatin1("can%1.1").arg(hardwareInfo->m_bDeviceNr));
+
+ initInfo->m_fTryNext = true; // continue enumerating with next device
}
QList<QCanBusDeviceInfo> SystecCanBackend::interfaces()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialbus-opensource-src-5.9.2/src/serialbus/doc/snippets/snippetmain.cpp
new/qtserialbus-opensource-src-5.9.3/src/serialbus/doc/snippets/snippetmain.cpp
---
old/qtserialbus-opensource-src-5.9.2/src/serialbus/doc/snippets/snippetmain.cpp
2017-09-22 11:29:57.000000000 +0200
+++
new/qtserialbus-opensource-src-5.9.3/src/serialbus/doc/snippets/snippetmain.cpp
2017-11-08 08:55:29.000000000 +0100
@@ -1,12 +1,22 @@
/****************************************************************************
**
** Copyright (C) 2017 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the QtSerialBus module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** 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 https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialbus-opensource-src-5.9.2/src/serialbus/doc/src/examples/can.qdoc
new/qtserialbus-opensource-src-5.9.3/src/serialbus/doc/src/examples/can.qdoc
---
old/qtserialbus-opensource-src-5.9.2/src/serialbus/doc/src/examples/can.qdoc
2017-09-22 11:29:57.000000000 +0200
+++
new/qtserialbus-opensource-src-5.9.3/src/serialbus/doc/src/examples/can.qdoc
2017-11-08 08:55:29.000000000 +0100
@@ -1,7 +1,7 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2017 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the documentation of the Qt Toolkit.
**
@@ -11,8 +11,8 @@
** 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
**
** GNU Free Documentation License Usage
** Alternatively, this file may be used under the terms of the GNU Free
@@ -20,7 +20,7 @@
** 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.
+** will be met: https://www.gnu.org/licenses/fdl-1.3.html.
** $QT_END_LICENSE$
**
****************************************************************************/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialbus-opensource-src-5.9.2/src/serialbus/doc/src/examples/qtserialbus-examples.qdoc
new/qtserialbus-opensource-src-5.9.3/src/serialbus/doc/src/examples/qtserialbus-examples.qdoc
---
old/qtserialbus-opensource-src-5.9.2/src/serialbus/doc/src/examples/qtserialbus-examples.qdoc
2017-09-22 11:29:57.000000000 +0200
+++
new/qtserialbus-opensource-src-5.9.3/src/serialbus/doc/src/examples/qtserialbus-examples.qdoc
2017-11-08 08:55:29.000000000 +0100
@@ -1,7 +1,7 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2017 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the documentation of the Qt Toolkit.
**
@@ -11,8 +11,8 @@
** 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
**
** GNU Free Documentation License Usage
** Alternatively, this file may be used under the terms of the GNU Free
@@ -20,7 +20,7 @@
** 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.
+** will be met: https://www.gnu.org/licenses/fdl-1.3.html.
** $QT_END_LICENSE$
**
****************************************************************************/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialbus-opensource-src-5.9.2/src/serialbus/doc/src/peakcan.qdoc
new/qtserialbus-opensource-src-5.9.3/src/serialbus/doc/src/peakcan.qdoc
--- old/qtserialbus-opensource-src-5.9.2/src/serialbus/doc/src/peakcan.qdoc
2017-09-22 11:29:57.000000000 +0200
+++ new/qtserialbus-opensource-src-5.9.3/src/serialbus/doc/src/peakcan.qdoc
2017-11-08 08:55:29.000000000 +0100
@@ -1,7 +1,7 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2017 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the documentation of the Qt Toolkit.
**
@@ -11,8 +11,8 @@
** 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
**
** GNU Free Documentation License Usage
** Alternatively, this file may be used under the terms of the GNU Free
@@ -20,7 +20,7 @@
** 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.
+** will be met: https://www.gnu.org/licenses/fdl-1.3.html.
** $QT_END_LICENSE$
**
****************************************************************************/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialbus-opensource-src-5.9.2/src/serialbus/doc/src/qtcanbus-backends.qdoc
new/qtserialbus-opensource-src-5.9.3/src/serialbus/doc/src/qtcanbus-backends.qdoc
---
old/qtserialbus-opensource-src-5.9.2/src/serialbus/doc/src/qtcanbus-backends.qdoc
2017-09-22 11:29:57.000000000 +0200
+++
new/qtserialbus-opensource-src-5.9.3/src/serialbus/doc/src/qtcanbus-backends.qdoc
2017-11-08 08:55:29.000000000 +0100
@@ -1,7 +1,7 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2017 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the documentation of the Qt Toolkit.
**
@@ -11,8 +11,8 @@
** 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
**
** GNU Free Documentation License Usage
** Alternatively, this file may be used under the terms of the GNU Free
@@ -20,7 +20,7 @@
** 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.
+** will be met: https://www.gnu.org/licenses/fdl-1.3.html.
** $QT_END_LICENSE$
**
****************************************************************************/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialbus-opensource-src-5.9.2/src/serialbus/doc/src/qtmodbus-backends.qdoc
new/qtserialbus-opensource-src-5.9.3/src/serialbus/doc/src/qtmodbus-backends.qdoc
---
old/qtserialbus-opensource-src-5.9.2/src/serialbus/doc/src/qtmodbus-backends.qdoc
2017-09-22 11:29:57.000000000 +0200
+++
new/qtserialbus-opensource-src-5.9.3/src/serialbus/doc/src/qtmodbus-backends.qdoc
2017-11-08 08:55:29.000000000 +0100
@@ -1,7 +1,7 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2017 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the documentation of the Qt Toolkit.
**
@@ -11,8 +11,8 @@
** 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
**
** GNU Free Documentation License Usage
** Alternatively, this file may be used under the terms of the GNU Free
@@ -20,7 +20,7 @@
** 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.
+** will be met: https://www.gnu.org/licenses/fdl-1.3.html.
** $QT_END_LICENSE$
**
****************************************************************************/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialbus-opensource-src-5.9.2/src/serialbus/doc/src/qtserialbus-index.qdoc
new/qtserialbus-opensource-src-5.9.3/src/serialbus/doc/src/qtserialbus-index.qdoc
---
old/qtserialbus-opensource-src-5.9.2/src/serialbus/doc/src/qtserialbus-index.qdoc
2017-09-22 11:29:57.000000000 +0200
+++
new/qtserialbus-opensource-src-5.9.3/src/serialbus/doc/src/qtserialbus-index.qdoc
2017-11-08 08:55:29.000000000 +0100
@@ -1,7 +1,7 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2017 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the documentation of the Qt Toolkit.
**
@@ -11,8 +11,8 @@
** 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
**
** GNU Free Documentation License Usage
** Alternatively, this file may be used under the terms of the GNU Free
@@ -20,7 +20,7 @@
** 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.
+** will be met: https://www.gnu.org/licenses/fdl-1.3.html.
** $QT_END_LICENSE$
**
****************************************************************************/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialbus-opensource-src-5.9.2/src/serialbus/doc/src/qtserialbus-module-cpp.qdoc
new/qtserialbus-opensource-src-5.9.3/src/serialbus/doc/src/qtserialbus-module-cpp.qdoc
---
old/qtserialbus-opensource-src-5.9.2/src/serialbus/doc/src/qtserialbus-module-cpp.qdoc
2017-09-22 11:29:57.000000000 +0200
+++
new/qtserialbus-opensource-src-5.9.3/src/serialbus/doc/src/qtserialbus-module-cpp.qdoc
2017-11-08 08:55:29.000000000 +0100
@@ -1,7 +1,7 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2017 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the documentation of the Qt Toolkit.
**
@@ -11,8 +11,8 @@
** 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
**
** GNU Free Documentation License Usage
** Alternatively, this file may be used under the terms of the GNU Free
@@ -20,7 +20,7 @@
** 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.
+** will be met: https://www.gnu.org/licenses/fdl-1.3.html.
** $QT_END_LICENSE$
**
****************************************************************************/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialbus-opensource-src-5.9.2/src/serialbus/doc/src/socketcan.qdoc
new/qtserialbus-opensource-src-5.9.3/src/serialbus/doc/src/socketcan.qdoc
--- old/qtserialbus-opensource-src-5.9.2/src/serialbus/doc/src/socketcan.qdoc
2017-09-22 11:29:57.000000000 +0200
+++ new/qtserialbus-opensource-src-5.9.3/src/serialbus/doc/src/socketcan.qdoc
2017-11-08 08:55:29.000000000 +0100
@@ -1,7 +1,7 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2017 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the documentation of the Qt Toolkit.
**
@@ -11,8 +11,8 @@
** 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
**
** GNU Free Documentation License Usage
** Alternatively, this file may be used under the terms of the GNU Free
@@ -20,7 +20,7 @@
** 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.
+** will be met: https://www.gnu.org/licenses/fdl-1.3.html.
** $QT_END_LICENSE$
**
****************************************************************************/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialbus-opensource-src-5.9.2/src/serialbus/doc/src/systeccan.qdoc
new/qtserialbus-opensource-src-5.9.3/src/serialbus/doc/src/systeccan.qdoc
--- old/qtserialbus-opensource-src-5.9.2/src/serialbus/doc/src/systeccan.qdoc
2017-09-22 11:29:57.000000000 +0200
+++ new/qtserialbus-opensource-src-5.9.3/src/serialbus/doc/src/systeccan.qdoc
2017-11-08 08:55:29.000000000 +0100
@@ -1,7 +1,7 @@
/****************************************************************************
**
** Copyright (C) 2016 Andre Hartmann <[email protected]>
-** Contact: http://www.qt.io/licensing/
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the documentation of the Qt Toolkit.
**
@@ -11,8 +11,8 @@
** 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
**
** GNU Free Documentation License Usage
** Alternatively, this file may be used under the terms of the GNU Free
@@ -20,7 +20,7 @@
** 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.
+** will be met: https://www.gnu.org/licenses/fdl-1.3.html.
** $QT_END_LICENSE$
**
****************************************************************************/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialbus-opensource-src-5.9.2/src/serialbus/doc/src/tinycan.qdoc
new/qtserialbus-opensource-src-5.9.3/src/serialbus/doc/src/tinycan.qdoc
--- old/qtserialbus-opensource-src-5.9.2/src/serialbus/doc/src/tinycan.qdoc
2017-09-22 11:29:57.000000000 +0200
+++ new/qtserialbus-opensource-src-5.9.3/src/serialbus/doc/src/tinycan.qdoc
2017-11-08 08:55:29.000000000 +0100
@@ -1,7 +1,7 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2017 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the documentation of the Qt Toolkit.
**
@@ -11,8 +11,8 @@
** 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
**
** GNU Free Documentation License Usage
** Alternatively, this file may be used under the terms of the GNU Free
@@ -20,7 +20,7 @@
** 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.
+** will be met: https://www.gnu.org/licenses/fdl-1.3.html.
** $QT_END_LICENSE$
**
****************************************************************************/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialbus-opensource-src-5.9.2/src/serialbus/doc/src/vectorcan.qdoc
new/qtserialbus-opensource-src-5.9.3/src/serialbus/doc/src/vectorcan.qdoc
--- old/qtserialbus-opensource-src-5.9.2/src/serialbus/doc/src/vectorcan.qdoc
2017-09-22 11:29:57.000000000 +0200
+++ new/qtserialbus-opensource-src-5.9.3/src/serialbus/doc/src/vectorcan.qdoc
2017-11-08 08:55:29.000000000 +0100
@@ -1,7 +1,7 @@
/****************************************************************************
**
** Copyright (C) 2016 Denis Shienkov <[email protected]>
-** Contact: http://www.qt.io/licensing/
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the documentation of the Qt Toolkit.
**
@@ -11,8 +11,8 @@
** 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
**
** GNU Free Documentation License Usage
** Alternatively, this file may be used under the terms of the GNU Free
@@ -20,7 +20,7 @@
** 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.
+** will be met: https://www.gnu.org/licenses/fdl-1.3.html.
** $QT_END_LICENSE$
**
****************************************************************************/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialbus-opensource-src-5.9.2/src/serialbus/qcanbus.cpp
new/qtserialbus-opensource-src-5.9.3/src/serialbus/qcanbus.cpp
--- old/qtserialbus-opensource-src-5.9.2/src/serialbus/qcanbus.cpp
2017-09-22 11:29:57.000000000 +0200
+++ new/qtserialbus-opensource-src-5.9.3/src/serialbus/qcanbus.cpp
2017-11-08 08:55:29.000000000 +0100
@@ -147,6 +147,17 @@
\note Some plugins might not or only partially support this function.
+ For example, the following call returns a list of all available SocketCAN
+ interfaces (which can be used for \l createDevice()):
+
+ \code
+ QString errorString;
+ const QList<QCanBusDeviceInfo> devices =
QCanBus::instance()->availableDevices(
+ QStringLiteral("socketcan"), &errorString);
+ if (!errorString.isEmpty())
+ qDebug() << errorString;
+ \endcode
+
\sa createDevice()
*/
QList<QCanBusDeviceInfo> QCanBus::availableDevices(const QString &plugin,
QString *errorMessage) const
@@ -180,9 +191,13 @@
For example, the following call would connect to the SocketCAN interface
vcan0:
\code
+ QString errorString;
QCanBusDevice *device = QCanBus::instance()->createDevice(
- QStringLiteral("socketcan"), QStringLiteral("vcan0"));
- device->connectDevice();
+ QStringLiteral("socketcan"), QStringLiteral("vcan0"),
&errorString);
+ if (!device)
+ qDebug() << errorString;
+ else
+ device->connectDevice();
\endcode
\note The \a interfaceName is plugin-dependent. See the corresponding
plugin documentation
