Merge remote-tracking branch 'origin/5.9' into dev

Change-Id: I2c625ec3f8a6393fcd0d13dfddae55af7f549347

3 files changed, 11 insertions, 7 deletions

diff --git a/src/plugins/canbus/socketcan/main.cpp b/src/plugins/canbus/socketcan/main.cpp
index d1e9115..92e759b 100644
--- a/src/plugins/canbus/socketcan/main.cpp
+++ b/src/plugins/canbus/socketcan/main.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
+** Copyright (C) 2017 The Qt Company Ltd.
 ** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the QtSerialBus module of the Qt Toolkit.
@@ -45,12 +45,11 @@
 QT_BEGIN_NAMESPACE
 
 //! [SocketCanFactory]
-class SocketCanBusPlugin : public QObject, public QCanBusFactory
+class SocketCanBusPlugin : public QObject, public QCanBusFactoryV2
 {
     Q_OBJECT
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QCanBusFactory" FILE "plugin.json")
-    Q_INTERFACES(QCanBusFactory)
-
+    Q_INTERFACES(QCanBusFactoryV2)
 
 public:
     QList<QCanBusDeviceInfo> availableDevices(QString *errorMessage) const override
diff --git a/src/plugins/canbus/socketcan/socketcanbackend.cpp b/src/plugins/canbus/socketcan/socketcanbackend.cpp
index bf6a164..27a847d 100644
--- a/src/plugins/canbus/socketcan/socketcanbackend.cpp
+++ b/src/plugins/canbus/socketcan/socketcanbackend.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
+** Copyright (C) 2017 The Qt Company Ltd.
 ** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the QtSerialBus module of the Qt Toolkit.
@@ -138,6 +138,11 @@ QList<QCanBusDeviceInfo> SocketCanBackend::interfaces()
         result.append(info);
     }
 
+    std::sort(result.begin(), result.end(),
+              [](const QCanBusDeviceInfo &a, const QCanBusDeviceInfo &b) {
+        return a.name() < b.name();
+    });
+
     return result;
 }
 
@@ -631,7 +636,7 @@ void SocketCanBackend::readSocket()
 {
     QVector<QCanBusFrame> newFrames;
 
-    while (true) {
+    for (;;) {
         struct canfd_frame frame;
         int bytesReceived;
 
diff --git a/src/plugins/canbus/socketcan/socketcanbackend.h b/src/plugins/canbus/socketcan/socketcanbackend.h
index 3caddd8..70c47c8 100644
--- a/src/plugins/canbus/socketcan/socketcanbackend.h
+++ b/src/plugins/canbus/socketcan/socketcanbackend.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
+** Copyright (C) 2017 The Qt Company Ltd.
 ** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the QtSerialBus module of the Qt Toolkit.