summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Replace the ssl feature with the openssl one6.5Alexey Edelev2023-10-161-2/+4
| | | | | | | | | | | | The 'OpcUa' module supports OpenSSL, but not a generic ssl, so the respective feature should be checked. Fixes: QTBUG-117681 Change-Id: I7722d07a35b574fbe6152572c09da0ca2fb124b0 Reviewed-by: Amir Masoud Abdol <amir.abdol@qt.io> (cherry picked from commit dc9e4b149a9712b350d1b5431ec03f9b6950451d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 3f69621df86ffaccfdd0c3f38911d07414d78ca9)
* Update dependencies on '6.5' in qt/qtopcuaQt Submodule Update Bot2023-10-131-2/+2
| | | | | Change-Id: I6b00184e39a4a0c5d199f5bdfdb565e4918771af Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtopcuaQt Submodule Update Bot2023-10-121-2/+2
| | | | | Change-Id: I3b9d1ccecd07bf15cf1d1efc12b492cbb7ce91b7 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtopcuaQt Submodule Update Bot2023-10-101-2/+2
| | | | | Change-Id: I890def0671f34f2f6331994954455fc44d4136a1 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtopcuaQt Submodule Update Bot2023-10-091-2/+2
| | | | | Change-Id: I2509907b7495b3f8138dc247934a7bb79ff5b3b9 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtopcuaQt Submodule Update Bot2023-10-051-2/+2
| | | | | Change-Id: Ifb75c0a648dd57a8e01ea24b9c17ba15112d503b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtopcuaQt Submodule Update Bot2023-10-041-2/+2
| | | | | Change-Id: I1d2d9be9338963c5d313f0e2509f21fd571d586b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtopcuaQt Submodule Update Bot2023-09-271-2/+2
| | | | | Change-Id: If6a155968d5a33a24669713ceed46d376f9fc8b9 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Bump version to 6.5.4Jani Heikkinen2023-09-271-1/+1
| | | | | Change-Id: I9165b6ea014c43babf69262f9d2af1f08734f57d Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Fix docs for building the open62541 pluginJannis Voelker2023-09-271-1/+1
| | | | | | | | Change-Id: Ic043fbbf586fce9ea711080a2567c98c37a8bb02 Reviewed-by: Frank Meerkoetter <frank.meerkoetter@basyskom.com> (cherry picked from commit 0a924214dce15f5608b9acb6c3515e2858e19ab9) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 1b48425ac63a58a2975519e876c0368272aff830)
* Update docs for OpenSSL supportJannis Voelker2023-09-271-14/+9
| | | | | | | | Change-Id: Ie881821b24b75e8225470780f42dc32c605b10fe Reviewed-by: Frank Meerkoetter <frank.meerkoetter@basyskom.com> (cherry picked from commit 13a155a54c8aa9e0cb6821fa0cec7efd14444e5c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 64d5f29bb5f275b65c43ca29c0789f6b73cae0c1)
* Fix continuation points release for history read rawJannis Voelker2023-09-273-30/+82
| | | | | | | | | | | | Releasing continuation points after having called readMoreData() at least once could lead to continuation points not being released if there was no continuation point for at least one of the nodes. Change-Id: I09f914cc704365b57edcd82d01dd30c1350693b3 Reviewed-by: Frank Meerkoetter <frank.meerkoetter@basyskom.com> (cherry picked from commit f33d82399c80c006f18d128df7e769be0b33cb68) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit a882de6c0bfda9fe7bc44ca1b2759d5566a97e55)
* Add history read to the features tableJannis Voelker2023-09-271-0/+4
| | | | | | | | Change-Id: Ib7fc334cfdf56077154ad7755435b1b3e61e804d Reviewed-by: Frank Meerkoetter <frank.meerkoetter@basyskom.com> (cherry picked from commit dadc2a11087231104a319d105eace45aab6895ff) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 4f52f97a39fadc2e20749af4114adb531fd34741)
* open62541: Fix modifyMonitoring() and disableMonitoring()Jannis Voelker2023-09-253-13/+70
| | | | | | | | | | | | | - Due to a broken check for changes, there were sometimes additional parameters in the monitoringStatusChanged() signal. - Calling disableMonitoring() for an attribute without monitored item didn't lead to a disableMonitoringFinished() signal. Change-Id: I1ab7f1a999319ea74bd545f05cb9c395e3534ab8 Reviewed-by: Frank Meerkoetter <frank.meerkoetter@basyskom.com> (cherry picked from commit 60a98da7dc9e5445bbca62c8a167ef90f71d85e2) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 328fc0a27fdfb0a8852818546434af9fdbccf448)
* Update dependencies on '6.5' in qt/qtopcuaQt Submodule Update Bot2023-09-251-2/+2
| | | | | Change-Id: I5a8d828239ebdfe2e8e368ea0c1b70f66211f56a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtopcuaQt Submodule Update Bot2023-09-221-2/+2
| | | | | Change-Id: I45dbe5834cbd00cd71ccb1108d9b861f50ef6065 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtopcuaQt Submodule Update Bot2023-09-211-2/+2
| | | | | Change-Id: I1699bf82775415ef563970e3e295f6bcb9b45491 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtopcuaQt Submodule Update Bot2023-09-191-2/+2
| | | | | Change-Id: Idf60f021a1ef595b003ee76fc73853be23261e0b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtopcuaQt Submodule Update Bot2023-09-181-2/+2
| | | | | Change-Id: I79c91998b7dedabb95004921eece8b9461a7d3c6 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtopcuaQt Submodule Update Bot2023-09-141-2/+2
| | | | | Change-Id: Iaffa5256397d3569e242e5838d797b72a500878d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtopcuaQt Submodule Update Bot2023-09-121-2/+2
| | | | | Change-Id: I2f9cfbcf0e4cb72afb04d8c26163ae7113a25bb3 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtopcuaQt Submodule Update Bot2023-09-061-2/+2
| | | | | Change-Id: I5a590936ebe659ee2dcc84c340857c2101e587c6 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Re-check validity for MethodNode and ValueNode after NodeId updateJannis Voelker2023-09-062-2/+6
| | | | | | | | | | | The current implementation was still providing a bad state after changing the NodeId to a valid id. This could happen if one part of the NodeId is provided via property binding. Change-Id: I730de490d46db8f0e0b2a5dbeca210edd2c00d54 Reviewed-by: Frank Meerkoetter <frank.meerkoetter@basyskom.com> (cherry picked from commit e762e247db121f2d53469918b006cc0d10772e61) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Doc: Add example categories for Qt OPC UA examplesMats Honkamaa2023-09-064-1/+5
| | | | | | | | Task-number: QTBUG-116162 Change-Id: I904a258aa8579f4f575b424f774f5b84f22eb4cd Reviewed-by: Topi Reiniö <topi.reinio@qt.io> (cherry picked from commit 0b16031b150b3f35902b4720de46ba294508c1eb) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtopcuaQt Submodule Update Bot2023-09-041-2/+2
| | | | | Change-Id: If5f1c807ce0425d27dc543e4660e3eeb193dd579 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtopcuaQt Submodule Update Bot2023-09-011-2/+2
| | | | | Change-Id: I35135565e760398b4408d1d6e70af58528d20a22 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtopcuaQt Submodule Update Bot2023-08-301-2/+2
| | | | | Change-Id: Iad75850293402319ee0ee4a2e6b465309cc5c909 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtopcuaQt Submodule Update Bot2023-08-291-2/+2
| | | | | Change-Id: Iee6db1df74b61aab97b5cb8e06918f39d7c57d75 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtopcuaQt Submodule Update Bot2023-08-281-2/+2
| | | | | Change-Id: I95adda0ea75140d2a898e19aa07a83ff9e5d7f4b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtopcuaQt Submodule Update Bot2023-08-251-2/+2
| | | | | Change-Id: I8fad664c7a27196f42e3ba6e41f54ca511ec53c4 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtopcuaQt Submodule Update Bot2023-08-241-2/+2
| | | | | Change-Id: I5ba2c7177cda29c00fc70b2a80d58ad408ce67b5 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtopcuaQt Submodule Update Bot2023-08-231-2/+2
| | | | | Change-Id: I8a8ee7de4636cec9ee0def954ff773b8a932f19d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtopcuaQt Submodule Update Bot2023-08-221-2/+2
| | | | | Change-Id: Iafff2319cedd38941aed1f104c6f2589c2ed9ebe Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtopcuaQt Submodule Update Bot2023-08-211-2/+2
| | | | | Change-Id: I0355ee9fdf87c4b954dbcc506465772527b073c1 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix error C2362 on WindowsMarius Dege2023-08-211-2/+5
| | | | | | | | | | | | | Initializing variables with NULL if the initialzation gets omitted by a GOTO label in open62541.c Upstream pull request: https://github.com/open62541/open62541/pull/5786 Change-Id: I4706e2849f49988d7057d6015c679068692fbd08 Task-number: QTBUG-113504 Reviewed-by: Frank Meerkoetter <frank.meerkoetter@basyskom.com> (cherry picked from commit 0bb2a58bd33b63c3b274bfd872d262fa021f311b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Add error message to some examples when building for AndroidElias Hautala2023-08-212-0/+8
| | | | | | | | | | Add error message to x509 and simulation server examples. Task-number: QTBUG-111933 Change-Id: Ia0b9f1af3c84e98fddbed412a11e23d2abd6f10b Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io> (cherry picked from commit a694805c649e74a540c5b46ddb1ce2b0bea659e2) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Exclude some examples from Android buildElias Hautala2023-08-212-1/+3
| | | | | | | | | | | Excludes x509 and waterpump example from Android build because of missing Qui and Quick dependencies. Task-number: QTBUG-111933 Change-Id: Idb18ad1e8602393b8f25797b229c1c08d0eaec07 Reviewed-by: Jannis Völker <jannis.voelker@basyskom.com> (cherry picked from commit c7d9d505aae33846e33a4b40edd8a05e64f5a136) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtopcuaQt Submodule Update Bot2023-08-161-2/+2
| | | | | Change-Id: Ice5611a00f3d233f7f77ac6603c3a18686571523 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Open62541AsyncBackend: fix qsizetype/int mismatchesMarc Mutz2023-08-152-15/+15
| | | | | | | | | | QList::size() is qsizetype, not int, since Qt 6.0. Change-Id: Id9a64bcb8246b25b00dc85094d23c997dbb6d647 Reviewed-by: Ahmad Samir <a.samirh78@gmail.com> Reviewed-by: Ivan Solovev <ivan.solovev@qt.io> (cherry picked from commit 7f95b20cc5656e17d96d9046cd2d37ad79b92476) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Handle OpenSSL with disabled SHA-1 signatures (open62541)Jannis Voelker2023-08-158-15/+125
| | | | | | | | | | | | | | | RHEL 9 ships the OpenSSL libraries with SHA-1 signatures disabled. The security policies Basic128Rsa15 and Basic256 rely on SHA-1 which renders them unsupported on this platform. This change checks for support and removes the two policies from the list returned by QOpcUaClient::supportedSecurityPolicies() and the endpoints in the test server if necessary. Change-Id: I7bf9f903b159d794ef02163760d0c4c4781538e9 Reviewed-by: Alex Blasche <alexander.blasche@qt.io> (cherry picked from commit 1b5465a4b3083d91e5c8c8ae9d558beb7b98b88c) Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Open62541AsyncBackend: don't deep-copy a QList just to iterate over itMarc Mutz2023-08-141-1/+2
| | | | | | | | | | | | | | | | | A ranged for loop over an rvalue Qt container detaches. To fix, store the temporary in a const variable, then iterate over that. Found by accident. Amends 9d28891a488d6232107c2add4524ba62a91551fc. Change-Id: I89687698ceb9a24e371cd650f42407e13ca1bec3 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> (cherry picked from commit 2a73d251600e3f454cf2cab9b5342072e77cf15c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtopcuaQt Submodule Update Bot2023-08-141-2/+2
| | | | | Change-Id: If083dd629215d7246ed7d12dd0491fe8c12b161f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtopcuaQt Submodule Update Bot2023-08-111-2/+2
| | | | | Change-Id: Id475c42077c7e611f1b80e2d7082cbd99a20e35f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtopcuaQt Submodule Update Bot2023-08-041-2/+2
| | | | | Change-Id: I5a6799313956feb92143ee115d3b3b0d9db949a6 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtopcuaQt Submodule Update Bot2023-08-021-2/+2
| | | | | Change-Id: I75f93efb3570687205e4a5df06db5c930654cb57 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtopcuaQt Submodule Update Bot2023-08-011-2/+2
| | | | | Change-Id: I54786c0f1e723b658887868ccc0b0cfccbc3f3bd Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtopcuaQt Submodule Update Bot2023-07-281-2/+2
| | | | | Change-Id: I1285879b11566652abafef1afdc6a7c4fb4806d2 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Modernize the X.509 example and make it more genericJannis Voelker2023-07-281-2/+6
| | | | | | | | | | | Use 2048 bits for the private key. Only the Unified Automation plugin supports private keys with password. So the example should create a key that can be used by both plugins by default. Change-Id: Ia46b345ff0666ae6dcf17a698934e6fb1ff7cce7 Reviewed-by: Frank Meerkoetter <frank.meerkoetter@basyskom.com> (cherry picked from commit 8523c81fbd818ad99e64b975e288ccfe28d0656f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix and improve X.509 key usage and extended key usageJannis Voelker2023-07-285-41/+59
| | | | | | | | | | | - Fix extended key usage with OpenSSL 3.0 - Client certificates need extended key usage clientAuth - Add new certificate to the OPC UA viewer example Change-Id: Ib0664bc4fc1edb4e5d3b6f78e1cdfc9e9655ac7c Reviewed-by: Frank Meerkoetter <frank.meerkoetter@basyskom.com> (cherry picked from commit 68587faea26a9cd3d1f7f7b0d23813015bd81c8f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix compiler (GCC 13) warning about dangling referenceAhmad Samir2023-07-231-1/+1
| | | | | | | | | | | | | | | src/plugins/opcua/open62541/qopen62541subscription.cpp:493:33: warning: possibly dangling reference to a temporary [-Wdangling-reference] 493 | const QVariant &currentOperand = filter.whereClause().at(i).filterOperands().at(j); | ^~~~~~~~~~~~~~ src/plugins/opcua/open62541/qopen62541subscription.cpp:493:96: note: the temporary was destroyed at the end of the full expression ‘QOpcUaContentFilterElement::filterOperands() const().QList<QVariant>::at(((qsizetype)j))’ 493 | const QVariant &currentOperand = filter.whereClause().at(i).filterOperands().at(j); | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~ Change-Id: Ib136cdca470355969a6dbb22cc484c65c12fcdaf Reviewed-by: Ivan Solovev <ivan.solovev@qt.io> Reviewed-by: Frank Meerkoetter <frank.meerkoetter@basyskom.com> (cherry picked from commit aad361cd6991b50cf4c96ea7b22be66a677c5452) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>