summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAssam Boudjelthia <assam.boudjelthia@qt.io>2021-10-01 16:55:48 +0300
committerAssam Boudjelthia <assam.boudjelthia@qt.io>2021-10-05 09:00:48 +0000
commitcc038ff5175c5aae5a15e86be8e14e38b8bb2c65 (patch)
treec87367e92d9606a36c61ced532dcdf7a0eba76c4
parente53922b424ca1130a7ee947fc01935033139821a (diff)
Fix warnings on Android with developer-build
* Fix warning about use of uninitialized variable. * Fix warning about hidden overload QObject::eventFilter(): 'OpcUaNode::eventFilter' hides overloaded virtual function [-Werror,-Woverloaded-virtual] Pick-to: 6.2 Task-number: QTBUG-91163 Change-Id: Ibe5ca6032724a4c36f0bd76f5d05973409be6379 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
-rw-r--r--src/declarative_opcua/opcuanode_p.h1
-rw-r--r--src/declarative_opcua/universalnode.cpp2
2 files changed, 2 insertions, 1 deletions
diff --git a/src/declarative_opcua/opcuanode_p.h b/src/declarative_opcua/opcuanode_p.h
index d858ffa..c66ce5a 100644
--- a/src/declarative_opcua/opcuanode_p.h
+++ b/src/declarative_opcua/opcuanode_p.h
@@ -124,6 +124,7 @@ public:
OpcUaNode::Status status() const;
const QString &errorMessage() const;
+ using QObject::eventFilter;
OpcUaEventFilter *eventFilter() const;
void setEventFilter(OpcUaEventFilter *eventFilter);
diff --git a/src/declarative_opcua/universalnode.cpp b/src/declarative_opcua/universalnode.cpp
index 62d0802..89fceac 100644
--- a/src/declarative_opcua/universalnode.cpp
+++ b/src/declarative_opcua/universalnode.cpp
@@ -373,7 +373,7 @@ bool UniversalNode::splitNodeIdAndNamespace(const QString nodeIdentifier, int *n
}
const QString ns = token[0].mid(3);
- bool ok;
+ bool ok = false;
if (namespaceIndex)
*namespaceIndex = ns.toUInt(&ok);
if (!ok) {