From 0f6f7cfceadd05d9ed677fbfdb7a6a8cc2249b50 Mon Sep 17 00:00:00 2001 From: Tarja Sundqvist Date: Thu, 22 Dec 2022 11:12:17 +0200 Subject: Bump version to 5.15.13 Change-Id: I7ca8be8becad47e2835965781b1735aa879f855a Reviewed-by: Tarja Sundqvist --- .qmake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- cgit v1.2.3 From abe946bea086c55bf7747954b7d5ee3ed8dbefac Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Fri, 20 Jan 2023 07:26:38 +0100 Subject: QRemoteObjectMetaObjectManager: fix -Wunused-but-set-variable Found by Clang 15: qremoteobjectnode.cpp:1050:9: warning: variable 'curIndex' set but not used [-Wunused-but-set-variable] int curIndex = 0; ^ Remove the variable. Amends 67ac9631dbb26394e6b9981494a0aaf6124284a9. Change-Id: I89b31ed525ebd34ba76853b6b634d77022d4635a Reviewed-by: Brett Stottlemyer (cherry picked from commit 8c1a52d8a976e7da642a592fc0624ed25e66f766) Reviewed-by: Qt Cherry-pick Bot --- src/remoteobjects/qremoteobjectnode.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/remoteobjects/qremoteobjectnode.cpp b/src/remoteobjects/qremoteobjectnode.cpp index b9638e8..3c3b195 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 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) -- cgit v1.2.3