summaryrefslogtreecommitdiff
path: root/src/ivicore
diff options
context:
space:
mode:
authorDominik Holland <dominik.holland@qt.io>2019-10-29 12:07:41 +0100
committerDominik Holland <dominik.holland@qt.io>2019-10-30 13:25:08 +0100
commitb8fef41e062dd45c86c452cc540c529e68cbd5f2 (patch)
treeb46c60e64995ca40eb4c32785aa3b0f64d35d261 /src/ivicore
parentfc77bd2653789dfff2b13512fb6ae8857e269287 (diff)
downloadqtivi-b8fef41e062dd45c86c452cc540c529e68cbd5f2.tar.gz
Fix compilation with 5.12 and 5.13
This partially reverts: 6e329be7d833279f3e616fb975de89332d3b97c1 The fixes worked only with the new APIs introduced with 5.14 Change-Id: I3ca0fea099fb825894e9abf02a66b20c83c497b3 Reviewed-by: Robert Griebl <robert.griebl@qt.io>
Diffstat (limited to 'src/ivicore')
-rw-r--r--src/ivicore/qiviservicemanager.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/ivicore/qiviservicemanager.cpp b/src/ivicore/qiviservicemanager.cpp
index 606c236..c1193a8 100644
--- a/src/ivicore/qiviservicemanager.cpp
+++ b/src/ivicore/qiviservicemanager.cpp
@@ -305,14 +305,14 @@ void QIviServiceManagerPrivate::addBackend(Backend *backend)
const QString newBackendFile = backend->metaData.value(fileNameLiteral).toString();
const QString newBackendFileBase = qtivi_helper::backendBaseName(newBackendFile);
const QStringList ifaceList = backend->metaData.value(interfacesLiteral).toStringList();
- const QSet<QString> newInterfaces = QSet<QString>(ifaceList.begin(), ifaceList.end());
+ const QSet<QString> newInterfaces = ifaceList.toSet();
bool addBackend = true;
if (!newBackendFile.isEmpty()) {
for (int i = 0; i < m_backends.count(); i++) {
Backend *b = m_backends[i];
const QStringList curIfaceList = backend->metaData.value(interfacesLiteral).toStringList();
- const QSet<QString> interfaces = QSet<QString>(curIfaceList.begin(), curIfaceList.end());
+ const QSet<QString> interfaces = curIfaceList.toSet();
if (interfaces == newInterfaces && b->name == backend->name) {
const QString fileName = b->metaData.value(fileNameLiteral).toString();
if (fileName == newBackendFile) {