summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update dependencies on 'dev' in qt/qtopcuaHEADdevQt Submodule Update Bot9 hours1-3/+3
| | | | | Change-Id: Id76d7fbcfd8debfd8e0a24bdb80e6339bb8b562a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtopcuaQt Submodule Update Bot30 hours1-3/+3
| | | | | Change-Id: Iaa0479e6dbbfe116b360c39d2dc322ed38f913ed Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtopcuaQt Submodule Update Bot3 days1-3/+3
| | | | | Change-Id: I5c295c65d697f3a1fa7e41a78e581e02074617cd Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtopcuaQt Submodule Update Bot4 days1-3/+3
| | | | | Change-Id: I509757571679703c251190d8bcaf737bddfc02c4 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtopcuaQt Submodule Update Bot5 days1-3/+3
| | | | | Change-Id: I882ad77d0778bdaf92ad66a6ed63d14957a53a21 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtopcuaQt Submodule Update Bot5 days1-3/+3
| | | | | Change-Id: I397fa0179ad3cf17f21f971163147e230e4be71c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtopcuaQt Submodule Update Bot7 days1-3/+3
| | | | | Change-Id: I6dc2ca15117244bb03a5806fc98de69197f28a4c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtopcuaQt Submodule Update Bot9 days1-3/+3
| | | | | Change-Id: I1d01f0db7b5fdc8e1beeb433b12775ab254f914b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtopcuaQt Submodule Update Bot9 days1-3/+3
| | | | | Change-Id: Ib90daa578923299d3e6fed94239d89db61fd5d18 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtopcuaQt Submodule Update Bot10 days1-3/+3
| | | | | Change-Id: I6a97aeb99483b844e71b6cf8a202d59c0248b768 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtopcuaQt Submodule Update Bot11 days1-3/+3
| | | | | Change-Id: I27d319a48b6d432daeb3b7962bda1476ef5b5d6a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtopcuaQt Submodule Update Bot12 days1-3/+3
| | | | | Change-Id: I781ea5a5eedd0b53bf3dcd27c0b30b0909a9d756 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtopcuaQt Submodule Update Bot2021-07-091-3/+3
| | | | | Change-Id: Id60cece9ee70a1d9bc1377ecc36efd57f4da694e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtopcuaQt Submodule Update Bot2021-07-081-3/+3
| | | | | Change-Id: I2251cd3d4dc64b7df092dfac6cebc0ebb5cb04b8 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* CMake: Don't give plugins PUBLIC usage requirementsJoerg Bornemann2021-07-061-1/+1
| | | | | | | | | | | | | | | | | | | | The pro2cmake.py conversion script faithfully reproduced the .pro files for the plugins, which specified the libraries as public. But in CMake, the implications of this are that public usage requirements should then be propagated to consumers. We don't expect any consumers, since a plugin is created as a MODULE library in CMake, so for Windows we don't even have an import library to link with. The only exception to this is for static builds where plugins are created as STATIC libraries instead, but only in certain controlled situations do we then link to plugins. Even then, usage requirements are not expected to propagate to the consumers, so these relationships should always be specified as private. Pick-to: 6.2 Task-number: QTBUG-90819 Change-Id: I7db09e5cc0f0e7179d2d6da2acf3c1eadc02f8e2 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Modernize QML moduleUlf Hermann2021-07-0274-1027/+792
| | | | | | | | Use declarative type registration, and create a proper backing library for the QML-exposed types. Change-Id: I56c6a3acd6e6c8ea2c1ac24435b8601f562dbaf6 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Avoid even more const char * to QString conversionsUlf Hermann2021-07-021-2/+2
| | | | | | | Let's see if I've finally found them all. Change-Id: I8b9678b7fef0b509ac14c0605163a18708cc2194 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Avoid further implicit constructions of QString from const char *Ulf Hermann2021-07-023-8/+9
| | | | | | Change-Id: I35085649ee1b258669a834928dab3c9661d61257 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Maximilian Goldstein <max.goldstein@qt.io>
* Change all QString("foo") constructions to use QStringLiteralUlf Hermann2021-07-0111-33/+55
| | | | | | | | You should not construct QStrings directly from C string literals. Change-Id: I4185376ab62d19c26864afe656e4d7236d20d44c Reviewed-by: Andrei Golubev <andrei.golubev@qt.io> Reviewed-by: Frank Meerkoetter <frank.meerkoetter@basyskom.com>
* Update dependencies on 'dev' in qt/qtopcuaQt Submodule Update Bot2021-07-011-2/+2
| | | | | Change-Id: I93ea16d446cb3b45f84d7c1d1b23db4cd70b7077 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtopcuaQt Submodule Update Bot2021-06-291-3/+3
| | | | | Change-Id: I096c6ddd6044f17a2460bddffee9578af5a8bca2 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtopcuaQt Submodule Update Bot2021-06-281-2/+2
| | | | | Change-Id: I6133f2d04d112857e1da8bf806c38bc744191e66 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtopcuaQt Submodule Update Bot2021-06-261-3/+3
| | | | | Change-Id: Ie454e80bc4d595a87b3d2c55a31d3787d14639db Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtopcuaQt Submodule Update Bot2021-06-251-3/+3
| | | | | Change-Id: I1430c8dbb0c5796305036e9de3843f3513751932 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Doc: Fix broken linkPaul Wicking2021-06-251-1/+1
| | | | | | | | .org was missing from the URL. Pick-to: 6.2 Change-Id: I3868814a62b27144ea6754953bfd404c9c1f10af Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* Update dependencies on 'dev' in qt/qtopcuaQt Submodule Update Bot2021-06-251-3/+3
| | | | | Change-Id: I9d35bc31a400305f47ab1248997b3b63396fe3bd Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtopcuaQt Submodule Update Bot2021-06-241-3/+3
| | | | | Change-Id: I12bbc60ea9b13ff375d14ddf0363eac34a8d4de6 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* fix wrong conditionLi Xinwei2021-06-221-1/+1
| | | | | | | | Windows 10 non-arm64 shouldn't be excluded for openssl. Pick-to: 6.2 Change-Id: I9ea0ae7a86f17aa4f00a2f6f119a59a994a66180 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Update dependencies on 'dev' in qt/qtopcuaQt Submodule Update Bot2021-06-211-3/+3
| | | | | Change-Id: I65dcecbf801a79124142e91c5d2b8fdef71650e5 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtopcuaQt Submodule Update Bot2021-06-171-3/+3
| | | | | Change-Id: I39970c5d17c5b74f297d74927591f7971da853a7 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Remove old configure-related filesJoerg Bornemann2021-06-174-221/+0
| | | | | | | | | | | | | Remove the configure.json and configure.pri files that were used for the qmake-based configure. Remove the .prev_*.cmake files that were a by-product of configurejson2cmake.py. Pick-to: 6.2 Task-number: QTBUG-89536 Change-Id: Ia9b0ed4dd8108d5a43cb5b6e878ac003d2d54f10 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Remove unneeded CMake variable assignmentsJoerg Bornemann2021-06-141-6/+0
| | | | | | | | | | | | Remove assignments to the transitionary variables QT_NO_INTERNAL_COMPATIBILITY_FUNCTIONS and QT_USE_FIXED_QT_ADD_RESOURCE_BASE. Both are not needed anymore. Task-number: QTBUG-94444 Change-Id: I57bff906ea18f12ce0a011ff06ff7913f4d0261c Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Avoid compile errorUlf Hermann2021-06-111-1/+1
| | | | | | | | It was trying to cast a QStringBuilder to QVariant. That only works via explicit conversion to QString. Change-Id: I2785e4c6ad0d5cc10fa301ae131019cf11a8931b Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Update dependencies on 'dev' in qt/qtopcuaQt Submodule Update Bot2021-06-081-3/+3
| | | | | Change-Id: Ie047b4079bd863d96185e309108230c49c91609a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtopcuaQt Submodule Update Bot2021-06-061-1/+1
| | | | | Change-Id: Ie5020b880461203cac2ec1043209fe3873fb5175 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtopcuaQt Submodule Update Bot2021-06-051-3/+3
| | | | | Change-Id: I5e4ae3c750bc4a9b2ef79bdcb472c37df15e54cc Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtopcuaQt Submodule Update Bot2021-06-051-3/+3
| | | | | Change-Id: Ibe86ffc23332c53b763a8f0770f177397e936528 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Port to new CMake APIUlf Hermann2021-06-053-26/+12
| | | | | | | | | This is a low-risk port to the new CMake API. It leaves all the procedural registration intact and just uses the new CMake syntax. Change-Id: I9162b905afb510b7403ef6eb61b46b01325e7b72 Reviewed-by: Andrei Golubev <andrei.golubev@qt.io> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Fix MSVC warning C4267Kai Köhne2021-06-021-1/+1
| | | | | | | qopen62541backend.cpp(1329): warning C4267: 'argument': conversion from 'size_t' to 'quint32', possible loss of data Change-Id: Ia79c25910fb4830658fb1f85cdcfe109232715f3 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Update dependencies on 'dev' in qt/qtopcuaQt Submodule Update Bot2021-06-011-3/+3
| | | | | Change-Id: I39d03fbe069e229ba9041fb3c522315538635e1b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtopcuaQt Submodule Update Bot2021-06-011-3/+3
| | | | | Change-Id: Ic2db272bdb9df120953326d1783ed3dd9769b10a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtopcuaQt Submodule Update Bot2021-05-311-3/+3
| | | | | Change-Id: If9d8dabe7abb9bed7e1b76eb2191bc9333999cb8 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtopcuaQt Submodule Update Bot2021-05-281-3/+3
| | | | | Change-Id: Ibe104594d500dcd4430bc56ee414dee8d62f0b4a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Replace QVariant::Int with QMetaType::IntKai Köhne2021-05-281-2/+2
| | | | | | | | | Fixes warning opcuarelativenodepath.cpp(143): warning C4996: 'QVariant::Type': Use QMetaType::Type instead. opcuarelativenodepath.cpp(180): warning C4996: 'QVariant::Type': Use QMetaType::Type instead. Change-Id: Ie0521a62758abdd36612970a9f8d8ced548fca61 Reviewed-by: Frank Meerkoetter <frank.meerkoetter@basyskom.com>
* Fix MSVC warning C4005 in open62541.cKai Köhne2021-05-271-1/+1
| | | | | | | Upstream merge request: https://github.com/open62541/open62541/pull/4439 Change-Id: I70ebdef6472a559a9374398563e61e2e0d9f4466 Reviewed-by: Frank Meerkoetter <frank.meerkoetter@basyskom.com>
* Update dependencies on 'dev' in qt/qtopcuaQt Submodule Update Bot2021-05-271-3/+3
| | | | | Change-Id: I19f89b93b9015953f4ea0a7862a75c02af329e01 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Disable OpenSSL for Windows 10 on ARM64Jannis Voelker2021-05-261-1/+3
| | | | | | | | | | | | The CI does not yet have OpenSSL libs for this platform. CMake detects the amd64 libraries and the build fails at the linking step. Task-number: QTBUG-93822 Change-Id: I0d762d5934593761a972465cacb86f50dbd593bc Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Frank Meerkoetter <frank.meerkoetter@basyskom.com>
* Update dependencies on 'dev' in qt/qtopcuaQt Submodule Update Bot2021-05-261-3/+3
| | | | | Change-Id: Ic53b6f081b7ec1edc5e6ff0ea758c25b48f5238d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* CMake: Disable usage of CMake API compatibility wrappersJoerg Bornemann2021-05-2510-22/+25
| | | | | | | | | | Setting the QT_NO_INTERNAL_COMPATIBILITY_FUNCTIONS variable in the project ensures we ported away from old API calls. Task-number: QTBUG-86815 Change-Id: I58d7107f556e2f06ecf5b47fab65ccec7d929b6d Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Update dependencies on 'dev' in qt/qtopcuaQt Submodule Update Bot2021-05-241-3/+3
| | | | | Change-Id: I4a8aef5e77e5a8be1e71b22f497f66bf2cc19f7f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>