summaryrefslogtreecommitdiffstats
path: root/src/plugins/canbus/socketcan
diff options
context:
space:
mode:
authorAndre Hartmann <aha_1980@gmx.de>2017-03-13 22:47:16 +0100
committerAndré Hartmann <aha_1980@gmx.de>2017-03-14 08:58:06 +0000
commit71a31bf19bb0cce506638bc79ba96bc5e5da92fe (patch)
treec6f00920514af341c144ca5373eca70dd9133104 /src/plugins/canbus/socketcan
parentff732fd1ae8385f86d6022363110133d1e885281 (diff)
SocketCAN: Sort device info list by device name
Otherwise the sorting depends on the directory structure in /sys/class/net/ Change-Id: I95cc3d5f5d88f16c3511a9594eb4c466f807ef71 Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Diffstat (limited to 'src/plugins/canbus/socketcan')
-rw-r--r--src/plugins/canbus/socketcan/socketcanbackend.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/plugins/canbus/socketcan/socketcanbackend.cpp b/src/plugins/canbus/socketcan/socketcanbackend.cpp
index e28c8ab..0244550 100644
--- a/src/plugins/canbus/socketcan/socketcanbackend.cpp
+++ b/src/plugins/canbus/socketcan/socketcanbackend.cpp
@@ -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;
}