summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update dependencies on '6.5' in qt/qtopcua6.5Qt Submodule Update Bot5 days1-2/+2
| | | | | Change-Id: Ibe996c2580549e0f9aa35c3d4be7def422a8a9f7 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtopcuaQt Submodule Update Bot7 days1-2/+2
| | | | | Change-Id: I1f94c11317b06dd94001f5aed010ec54f0bc2a48 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtopcuaQt Submodule Update Bot12 days1-2/+2
| | | | | Change-Id: I8f8064ffce0288405502337b29206a3499d3b02e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtopcuaQt Submodule Update Bot2023-03-111-2/+2
| | | | | Change-Id: If1119866c03bab34bfb764c71c2a33133ec83110 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtopcuaQt Submodule Update Bot2023-03-081-2/+2
| | | | | Change-Id: Ib18b0828c55f9072af3ae73e1a79577a696aec59 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtopcuaQt Submodule Update Bot2023-03-031-2/+2
| | | | | Change-Id: Ia3f08a4ce6f773cb237962e14710980af232ffcb Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtopcuaQt Submodule Update Bot2023-03-021-2/+2
| | | | | Change-Id: I42d00e26d0f83090d4afc2d094b459916e0d2641 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtopcuaQt Submodule Update Bot2023-03-011-2/+2
| | | | | Change-Id: I1dcffa30ee6f82b23aec6e69fc45822bed95629c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* OpcuaViewer: Don't locate files relative to binaryKai Köhne2023-02-245-54/+73
| | | | | | | | | | | | | | | | | The logic to locate files relative to the binary is fragile. It is currently broken for CMake on Windows, and not actually implemented in qmake. Furthermore, it requires the binary directory to be writable at runtime, because additional folders will be created there. Instead, embed the files via qrc, and extract them at runtime into AppLocalDataLocation, which we know we can read/write to. Fixes: QTBUG-109097 Change-Id: Ia6994339f4eba94ee6ef0cd82eadcc72563b7d47 Reviewed-by: Ivan Solovev <ivan.solovev@qt.io> (cherry picked from commit ddfe3639386c235d50a54c46071983525ed3a645) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtopcuaQt Submodule Update Bot2023-02-231-2/+2
| | | | | Change-Id: If7b4975f0a8f93602f7b46139f610e869d9bac9c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtopcuav6.5.0-beta3Qt Submodule Update Bot2023-02-171-2/+2
| | | | | Change-Id: I51b2136694f4e6eae46246bf13f153ebf6169ee7 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Also update the version information hereFrank Meerkötter2023-02-141-1/+1
| | | | | | | We pulled in open62541 1.3.4 for the 6.5 release Change-Id: Icad578676cbb36b8955730ec54dd5edfc5feccab Reviewed-by: Frank Meerkoetter <frank.meerkoetter@basyskom.com>
* Update dependencies on '6.5' in qt/qtopcuaQt Submodule Update Bot2023-02-101-2/+2
| | | | | Change-Id: Ide7badf35bc3f9009e11b92e5fecbb3d67c78e6d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Remove remains of qmake conversion from CMakeLists.txt filesFriedemann Kleint2023-02-1019-140/+12
| | | | | | | | Change-Id: I17b48757cf0de6b123c96db4dfc7d227c6384071 Reviewed-by: Amir Masoud Abdol <amir.abdol@qt.io> Reviewed-by: Frank Meerkoetter <frank.meerkoetter@basyskom.com> (cherry picked from commit ebe129654a9c5170e121c7d294310af031696c17) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix CMake Unity (Jumbo) buildsFriedemann Kleint2023-02-022-0/+9
| | | | | | | | | | | Add missing header guards and exclude problematic source file. Task-number: QTBUG-109394 Change-Id: I170824448de8b030b444ce9a5d9b15eeca145a22 Reviewed-by: Amir Masoud Abdol <amir.abdol@qt.io> Reviewed-by: Frank Meerkoetter <frank.meerkoetter@basyskom.com> (cherry picked from commit 3adfac4a7ae2d55ac64b39cd80c876826abb08c5) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Drop QML_UNCREATABLE macros from namespacesUlf Hermann2023-02-022-3/+0
| | | | | | | | | | | Namespaces are always uncreatable. Fixes: QTBUG-110837 Change-Id: I9382acc5fefba1b17a1490aa0f53437f0a5c8608 Reviewed-by: Semih Yavuz <semih.yavuz@qt.io> Reviewed-by: Frank Meerkoetter <frank.meerkoetter@basyskom.com> (cherry picked from commit 54cec1bb412b4d86f4c21c4df42a222ecd2aeaf1) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtopcuaQt Submodule Update Bot2023-02-021-2/+2
| | | | | Change-Id: I2f4098bc91fbdbbc3db79deded2f13e3163f7252 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtopcuav6.5.0-beta2Qt Submodule Update Bot2023-01-231-2/+2
| | | | | Change-Id: I3c074cf64e312ab1c0cd3ae4c1b884b11d455fd3 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtopcuaQt Submodule Update Bot2023-01-131-2/+2
| | | | | Change-Id: I9240450a41ad384be8eab874938c0fbecc936383 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtopcuaQt Submodule Update Bot2023-01-091-2/+2
| | | | | Change-Id: I596acc884a0f9258e55fbb1446c46dea527e6772 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtopcuaQt Submodule Update Bot2023-01-041-2/+2
| | | | | Change-Id: I469d17aec0613ad7059e634b31e30fb20c15dcf7 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Remove QT_USE_SYNCQT_CPPAlexey Edelev2023-01-021-2/+0
| | | | | | | | | Option has not effect anymore. Change-Id: I5b714f75e954aa8c6ab997b60aa356fcab7e9eb4 Reviewed-by: Kai Köhne <kai.koehne@qt.io> (cherry picked from commit 9d7b496e2438bd4777d8ba987ee8e1efa10a9240) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtopcuaQt Submodule Update Bot2023-01-021-2/+2
| | | | | Change-Id: Ifc44891eb8a8dd58071f9e238522b67b5e87354f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtopcuaQt Submodule Update Bot2022-12-301-2/+2
| | | | | Change-Id: I527bb5cd6ad4255873f62a10954d6d853f85d4d0 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtopcuaQt Submodule Update Bot2022-12-291-2/+2
| | | | | Change-Id: Icc2a49a97661dadc192454549a0f88bf218046a1 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtopcuaQt Submodule Update Bot2022-12-281-2/+2
| | | | | Change-Id: I3433e2b64f522b94a940e815b69a506fb812278c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtopcuaQt Submodule Update Bot2022-12-261-2/+2
| | | | | Change-Id: Ied7ce2c591bd66c3647ba5ce2a1f5242447e0555 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtopcuaQt Submodule Update Bot2022-12-231-2/+2
| | | | | Change-Id: I76183946f2d3e007fa695d5f50a1ccdff0a1a2bf Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* OpcuaViewer: Do not wrap API in Qt namespaceKai Köhne2022-12-218-38/+12
| | | | | | | | | | | | | | | | The custom Qt namespace should be reserved for Qt library types, not example types. THerefore remove QT_BEGIN_NAMESPACE, QT_END_NAMESPACE macros. To keep compatibility with a namespaced Qt, we now include the respective headers, instead of pre-declaring Qt types. Also sort include lines while at it. Change-Id: I8c4c6f5f2b5768eae297923e0081820ade8e50f4 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Frank Meerkoetter <frank.meerkoetter@basyskom.com> (cherry picked from commit 9130e5312be92bed90395f09b218f43e01b25077) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtopcuav6.5.0-beta1Qt Submodule Update Bot2022-12-161-2/+2
| | | | | Change-Id: Iaaa36e090e791ad25e7eb7e5d9fa6bef338241fe Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* qtopcua: fix simulationserver source lookupShyamnath Premnadh2022-12-142-3/+9
| | | | | | | | | | | | | - for Qt major greater than 5, look up the sources in 'Src' folder in the Qt installation - the orginal relative path for MODULE_SOURCES given was also wrong. This is now fixed. Fixes: QTBUG-109096 Change-Id: Iabcf8baaf1a440b863aaf9ead3cfbb63c98d8b02 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit 9b122a201bc971da5ce5394f59e8c08b74b5ee50) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtopcuaQt Submodule Update Bot2022-12-141-1/+1
| | | | | Change-Id: I0227b003f39e3e2ba2da8d8db2d5312eac3675e3 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Doc: Make security.html page name more uniqueKai Köhne2022-12-131-1/+1
| | | | | | | | | | | All qt modules share a common documentation namespace. So avoid overly generic page names - security is not only relevant in the OPC UA context. Change-Id: I188a1d66ee0b9e56ea7d7df2d598c79d1b64104f Reviewed-by: Frank Meerkoetter <frank.meerkoetter@basyskom.com> (cherry picked from commit 471f7396494b8a593ad22b42e0bb09c4ecf9ff3c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtopcuaQt Submodule Update Bot2022-12-131-2/+2
| | | | | Change-Id: I2d4d9b857e0a288b31e89e952465d8b98889deb6 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Modernize example's CMakeLists.txtKai Köhne2022-12-136-35/+34
| | | | | | | | | | | * Use qt_standard_project_setup() * Use Qt6:: prefix, instead of Qt:: * Use private linkage wherever possible Change-Id: I8af4fdeed78f7cba26308f1c7932e6f9fc256ade Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit c323ecb786a12a6b6a02f6e951ca91ca67f30bf9) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Route Qt::TimeSpec usage via QTimeZoneEdward Welbourne2022-12-124-10/+15
| | | | | | | | QTimeZone now packages Qt::TimeSpec details, unifying QDateTime APIs. Task-number: QTBUG-108199 Change-Id: I3f8d14a3fd9a6ba04bf072bb6af2249c2e007ec7 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Update dependencies on 'dev' in qt/qtopcuaQt Submodule Update Bot2022-12-121-2/+2
| | | | | Change-Id: I0ae35ac1658c881a28086ce152ca5778745954cc Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtopcuaQt Submodule Update Bot2022-12-081-2/+2
| | | | | Change-Id: I45d4c6d46c6f92e28a76515b621349dfc5d882d8 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Mark the module free of qAsConst()Marc Mutz2022-12-051-0/+1
| | | | | Change-Id: Ic4d204a7003e5634eded27c5e7f043e78610b9b4 Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
* Update dependencies on 'dev' in qt/qtopcuaQt Submodule Update Bot2022-12-051-2/+2
| | | | | Change-Id: I124343c6dc0b3c66de06505133c51f623f445f11 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtopcuaQt Submodule Update Bot2022-11-291-1/+1
| | | | | Change-Id: I999fd15b696c8ea72791083e04ec3e86e7264ce4 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtopcuaQt Submodule Update Bot2022-11-261-2/+2
| | | | | Change-Id: I2521f46de1b8f295b6cc908fb4102541adc4b81c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtopcuaQt Submodule Update Bot2022-11-251-2/+2
| | | | | Change-Id: Ia276b35fd3fdc1a5d3eb187facaf10d9d1816a4c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* BLACKLIST: connectAndDisconnectSecureUnencryptedKey for Red Hat 9Heikki Halmet2022-11-201-0/+3
| | | | | | | | | | Let's blacklist this now and remove the blacklisting when fix is merged. Should be fixed ASAP. Task-number: QTBUG-106285 Change-Id: If9a179df2f25574326cc1df4905cbb161647973b Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtopcuaQt Submodule Update Bot2022-11-171-2/+2
| | | | | Change-Id: I9b4ccd081e9854e2dc266a8b2be6237c154cba45 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update open62541 to v1.3.4Jannis Voelker2022-11-164-348/+56
| | | | | Change-Id: If0e6058a78d5236f4de81811edab43365aa82a8e Reviewed-by: Frank Meerkoetter <frank.meerkoetter@basyskom.com>
* Enable loading OpenSSL 3.0 DLLs on WindowsJannis Voelker2022-11-161-0/+5
| | | | | | Change-Id: I10ac59acb24922cf6cc67cdaf32659cd575e89a4 Task-number: QTBUG-108253 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Update dependencies on 'dev' in qt/qtopcuaQt Submodule Update Bot2022-11-161-2/+2
| | | | | Change-Id: I54e2b6034f4882638b5e1e4c23c98ba0fde9199c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtopcuaQt Submodule Update Bot2022-11-141-2/+2
| | | | | Change-Id: Ib6da931d92f8eca331e6227bb27463eccec1bc06 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update open62541 to 1.3Martin Klos2022-11-1123-30198/+40658
| | | | | | | | | The open62541 plugin now supports the Aes128_Sha256_RsaOaep security policy. MacOS on M1 has been disabled due to issue #5198 in open62541. Change-Id: I8b1cf704a9a0532fa9eb2c9099cac62ac9263a49 Reviewed-by: Frank Meerkoetter <frank.meerkoetter@basyskom.com>