summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTarja Sundqvist <tarja.sundqvist@qt.io>2024-01-04 21:22:07 +0200
committerTarja Sundqvist <tarja.sundqvist@qt.io>2024-01-04 21:22:07 +0200
commit18ef1cdce7bc4c93415f38f1c220ab697aa75908 (patch)
treea2fbb40d1029a38f5d379a1fc0c92b1083bdc793
parentf64e34be9ac4b7e92c63e47235c04471a1d40c93 (diff)
parentabe946bea086c55bf7747954b7d5ee3ed8dbefac (diff)
Merge remote-tracking branch 'origin/tqtc/lts-5.15.13' into tqtc/lts-5.15-opensourcev5.15.13-lts-lgpl5.15
-rw-r--r--.qmake.conf2
-rw-r--r--src/remoteobjects/qremoteobjectnode.cpp4
2 files changed, 1 insertions, 5 deletions
diff --git a/.qmake.conf b/.qmake.conf
index 242d4fc..5894ea6 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -4,6 +4,6 @@ CONFIG += qt_example_installs
DEFINES += QT_NO_JAVA_STYLE_ITERATORS
DEFINES += QT_NO_FOREACH
-MODULE_VERSION = 5.15.12
+MODULE_VERSION = 5.15.13
QTRO_SOURCE_TREE = $$PWD
diff --git a/src/remoteobjects/qremoteobjectnode.cpp b/src/remoteobjects/qremoteobjectnode.cpp
index bf887e3..bd00ae9 100644
--- a/src/remoteobjects/qremoteobjectnode.cpp
+++ b/src/remoteobjects/qremoteobjectnode.cpp
@@ -919,15 +919,12 @@ QMetaObject *QRemoteObjectMetaObjectManager::addDynamicType(IoDeviceBase *connec
}
parseGadgets(connection, in);
- int curIndex = 0;
-
in >> numSignals;
for (quint32 i = 0; i < numSignals; ++i) {
QByteArray signature;
QList<QByteArray> paramNames;
in >> signature;
in >> paramNames;
- ++curIndex;
auto mmb = builder.addSignal(signature);
mmb.setParameterNames(paramNames);
}
@@ -939,7 +936,6 @@ QMetaObject *QRemoteObjectMetaObjectManager::addDynamicType(IoDeviceBase *connec
in >> signature;
in >> returnType;
in >> paramNames;
- ++curIndex;
const bool isVoid = returnType.isEmpty() || returnType == QByteArrayLiteral("void");
QMetaMethodBuilder mmb;
if (isVoid)