summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge tag 'v6.5.6-lts' into tqtc/lts-6.5-opensourceTarja Sundqvist2025-04-302-1/+5
|\ | | | | | | | | | | | | | | | | Qt 6.5.6-lts release Conflicts solved: dependencies.yaml Change-Id: I6466496da8f5c1469a12f6cb798a6062e16ac144
| * Fix slot return values of container<pod>Marc Hüskens2024-03-141-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Added missing call to decodeVariant before informing replicas Pick-to: 6.2 Change-Id: Ibb83f02fc901390c4ec92de836d9663315ab112c Reviewed-by: Brett Stottlemyer <bstottle@ford.com> (cherry picked from commit 73ee1f826195d80384c1fd1eefd7bbc176542b2d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit a7bd0a523a793a54600b1f3a492346cc7972454e) (cherry picked from commit fe6e1e86f64d7054da76449a4e3e03a1bb84a47d)
| * Replace #pragma once with traditional header guardsMarc Mutz2024-02-291-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | #pragma once was never allowed for installed headers¹ and syncqt.cpp will now start to enforce this, so port the existing users in this module to traditional header guards. ¹ https://lists.qt-project.org/pipermail/development/2022-October/043121.html Amends 0fbfa7affa2aa22d338135d6f52ef3d3d4145766. Pick-to: 6.2 Change-Id: Id38cd34f97946e7f7d5033f431876ea8e8b06978 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit 301092d8bd269b02fb8c749e38fa464f819835ab) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 2d2e3b551bd4b40e3e396f8df8104111d3cc189c) (cherry picked from commit 29c2c550f62481c59ffe3f9589d87c9d379e9e5a)
* | Merge tag 'v6.5.5-lts' into tqtc/lts-6.5-opensourcev6.5.5-lts-lgplTarja Sundqvist2025-01-302-5/+11
|\| | | | | | | | | | | | | | | | | Qt 6.5.5-lts release Conflicts solved: dependencies.yaml Change-Id: I52adaf27d5a9aae3ae3550b1f4757bcd8da18f28
| * QConnectedReplicaImplementation: don't call deleteLater() on a nullptrMarc Mutz2023-12-211-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's undefined behavior according to C++, even if you don't touch members, and only happened to work until qtbase/13074a967f18ed348ab744f7ff831965607a6421 which made it stop "working". Add an explicit nullptr check before calling deleteLater(). Amends 35dd08098f8a4b422d523792261aefe039358f6a(!). Fixes: QTBUG-120242 Pick-to: 6.2 5.15 Change-Id: I9ce95f8c8f917549ccfd0040f0cd4f483c3a28d0 Reviewed-by: Juha Vuolle <juha.vuolle@qt.io> (cherry picked from commit 4ef440b458c526ad24a3e87d480ddb44c76c6438) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 405812b7609fbaf2be2575175fabdc4fdc77c1f7) (cherry picked from commit e32daf67a6a8895101641aaf753409dd284b18d3)
| * Re-allow names containing ENUM in rep filesMårten Nordheim2023-11-271-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Expand the test from just looking for the existence of ENUM and instead check that a sequence starts with ENUM and is not followed by a letter. Fixes: QTBUG-117379 Change-Id: Ibf979eff0efee2fd82eac1c5c20a1a8bbc2ef2e6 Reviewed-by: Brett Stottlemyer <bstottle@ford.com> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit 96cfbcc4570fcc4e426fdd6699d3666f49bf5c26) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 213ab4256e07d65a61a37c96b0d9d17b56ad8477)
* | Revert "Update commercial SPDX-License-Identifier"Tarja Sundqvist2025-01-0356-56/+56
|/ | | | | | | | | | This reverts commit a2159bed64ee183230fa0691319bfbafaffa1821. Revert of commercial SPDX license identifiers is required for the Qt 6.5.x opensource releases, Qt 6.5.4 onwards. Change-Id: I5f5b33fa20ffd2372f33c514ab8a87e7d4ffd8a1 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Remove commercial SPDX-License-Identifier from build filesTarja Sundqvist2023-11-237-7/+7
| | | | | | | | | The build files should not include a commercial SPDX-License-Identifier. Instead, a BSD-3-Clause license identifier is used. Task-number: QTQAINFRA-5900 Change-Id: I790fb1c515d6951be480df6b6d9a139af4b2ad5f Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Highlight Time Server / Client Application examplesKai Köhne2023-11-171-0/+3
| | | | | | | | | Task-number: QTBUG-117221 Change-Id: I77f96e9753dfacf1f7308da7537807a8a0bc38a6 Reviewed-by: Topi Reiniö <topi.reinio@qt.io> (cherry picked from commit 306ce5c920f0fddec2c20ac6e4587328254f60b8) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 1a0c85435b12a6d1bb8d82c8b4271bff42e844e0)
* Update commercial SPDX-License-IdentifierTarja Sundqvist2023-11-1463-63/+63
| | | | | | | | | | Updated the commercial SPDX-License-Identifier to the files in tqtc-qtremoteobjects. Examples, tests, or documentation files are not updated. Task-number: QTQAINFRA-5900 Change-Id: If04faf7617c8c83f0c25a4e04b4d38b6c15f1368 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Fix a crash due to null QHostAddress in the TCP/IP backendFriedemann Kleint2023-11-111-8/+9
| | | | | | | | | | | | | | When called in boot phases of embedded devices, host name resolution can fail, resulting in an assert/crash. Bail out with a warning instead. Pick-to: 6.2 5.15 Fixes: QTBUG-116151 Change-Id: I1d8465bd35ff250d3a4b9dbde53bd6634ae70fc6 Reviewed-by: Brett Stottlemyer <bstottle@ford.com> (cherry picked from commit 65dbc006c81ccaea6af5f0b1e2425cfdb2158325) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 505c50ce8acb4785811b803752bb9e1cf1feb116)
* Document simpleswitch examplesØystein Heskestad2023-10-111-0/+0
| | | | | | | | | Task-number: QTBUG-112850 Change-Id: I43cc08101153f10c30cd8ffa38649fd8e84ddbd2 Reviewed-by: Brett Stottlemyer <bstottle@ford.com> (cherry picked from commit c2ba4a68bb50d274ec984e4473709e05722e72bd) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 05d5ef025ec49130e7e2382df7c7de6444733623)
* QtROIoDeviceBasePrivate: fix memleak of the codec objectIvan Solovev2023-09-192-2/+4
| | | | | | | | | | | | | | | As reported by ASAN, there is a memory leak for the QtROIoDeviceBasePrivate::m_codec object. It seems that the codec was created in QRemoteObjectNodePrivate::onClientRead(), but never deleted. Fix it by wrapping the codec into std::unique_ptr. Pick-to: 6.2 Change-Id: I49bc9a8031e657cac064551b51bb0b8082865887 Reviewed-by: Brett Stottlemyer <bstottle@ford.com> Reviewed-by: Øystein Heskestad <oystein.heskestad@qt.io> (cherry picked from commit 102f1449a9891b0d79b6f9754ab70fa37aea117a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 6d3fa6de47aafc0e39dbc14f88065c5a2345b4d5)
* Doc: Fix typedef description of QRemoteObjectSourceLocation(s)Andreas Eliasson2023-08-281-4/+7
| | | | | | | | | | | | | The docs indicate that its properties and members are typedefs for QPair/QHash<QString, QUrl>, when in fact they should be <QString, QRemoteObjectSourceLocationInfo> Fixes: QTBUG-115458 Change-Id: Ic79f7f56be2a12a2c3a89ed1a9e1f9c9f23f6eac Reviewed-by: Brett Stottlemyer <bstottle@ford.com> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit 111cfce6c2f22e8c448f83df023cd45bf0c97ff2) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update snippets to match the simpleswitch examples they are taken fromØystein Heskestad2023-08-161-41/+42
| | | | | | | | | | | | This is a clean up of the snippets before the simpleswitch examples are removed. Task-number: QTBUG-112850 Change-Id: Ib58676fe8ad95ce52a108cd3a4d986534e2eb1b5 Reviewed-by: Dennis Oberst <dennis.oberst@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> (cherry picked from commit 82fd6b3d12ff4d5d4449191b317e2d69fbadc4a3) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Doc: Remove \ingroup all-examples command from the docsJaishree Vyas2023-07-121-1/+0
| | | | | | | | Task-number: QTBUG-115044 Change-Id: I9da3c45fce9da5100b17c5079dc07128c523b7ef Reviewed-by: Topi Reiniö <topi.reinio@qt.io> (cherry picked from commit 01aafb18809086e4e79d3c061b98969bac9afed0) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Revamp WebSockets exampleØystein Heskestad2023-06-061-0/+0
| | | | | | | | | | Fix a warning, expand the documentation, and add a picture to it. Task-number: QTBUG-112850 Change-Id: I203392a95bef206fecc2777d060e215d95235296 Reviewed-by: Alex Blasche <alexander.blasche@qt.io> (cherry picked from commit 5586e24e1e8330b55dd738a4eac000faafcf22c9) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Revamp SSL exampleØystein Heskestad2023-06-061-0/+0
| | | | | | | | | | | | | The example did not work because the two applications used different rep-files to generate the remote objects. Use the same file in both applications, fix usage of case in naming, expand the documentation, and add a picture. Remove unused PresetData from rep-file. Task-number: QTBUG-112850 Change-Id: Ia7aafc52d647bca9ffec12b8dd548377f20b6ce4 Reviewed-by: Alex Blasche <alexander.blasche@qt.io> (cherry picked from commit 743de69538696ea14e299c32056d40851bb9fdcd) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Remove remains of qmake conversion from CMakeLists.txt filesFriedemann Kleint2023-02-221-5/+0
| | | | | | | Change-Id: I86fb2afcd299e1156846a203161bfb55b936c27a Reviewed-by: Brett Stottlemyer <bstottle@ford.com> (cherry picked from commit 84ec45e61c8ff37d8a075a1fe8e86d12b5f4616d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QRemoteObjectMetaObjectManager: fix -Wunused-but-set-variableMarc Mutz2023-01-201-4/+0
| | | | | | | | | | | | | | | | | 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 <bstottle@ford.com> (cherry picked from commit 8c1a52d8a976e7da642a592fc0624ed25e66f766) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Remove qlalr warnings when building the moduleBrett Stottlemyer2022-12-311-27/+32
| | | | | | | | | | | Building the module's rep parser yields shift/reduce and reduce/reduce conflicts. This commit removes these warnings (altogether 52). Fixes: QTBUG-104068 Change-Id: I2c988f5e250b73dc4a1f791534f1dc155bbcd20a Reviewed-by: Juha Vuolle <juha.vuolle@insta.fi> (cherry picked from commit aac2ed94da993dc9f0b7856471c2aefacc005d11) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix missing QIODevice disconnect() signal connectionLionel Fafchamps2022-12-121-1/+1
| | | | | | | | | | | | | | | | | The QtROExternalIoDevice fails to register a disconnect() signal from the underlying QIODevice. If the server tries to initiate communication after the client disconnects, it will segfault trying to access the QIODevice. There is a metaObject check for the disconnect() signal before connecting, as disconnect() isn't part of the QIODevice interface. However, metaObject::indexOfSignal is being passed a SIGNAL(disconnect()), which is not the correct format. It should be passed the normalized signature "disconnect()" Pick-to: 5.15 6.2 6.4 Change-Id: I6cc6d51faff49d4106f4126352e1e9e6cf6165a2 Reviewed-by: Brett Stottlemyer <bstottle@ford.com>
* CMake: Use new _qt_internal_get_tool_wrapper_script_pathAlexandru Croitor2022-10-281-5/+12
| | | | | | | | | As a drive-by, remove old usage of QT_TOOL_PATH_SETUP_COMMAND Pick-to: 6.4 Change-Id: I796792a907684db6df77849d2bd4b61ef03b3a15 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
* Port from container::count() and length() to size() - V4Marc Mutz2022-10-092-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a semantic patch using ClangTidyTransformator as in qtbase/df9d882d41b741fef7c5beeddb0abe9d904443d8, but extended to handle typedefs and accesses through pointers, too: const std::string o = "object"; auto hasTypeIgnoringPointer = [](auto type) { return anyOf(hasType(type), hasType(pointsTo(type))); }; auto derivedFromAnyOfClasses = [&](ArrayRef<StringRef> classes) { auto exprOfDeclaredType = [&](auto decl) { return expr(hasTypeIgnoringPointer(hasUnqualifiedDesugaredType(recordType(hasDeclaration(decl))))).bind(o); }; return exprOfDeclaredType(cxxRecordDecl(isSameOrDerivedFrom(hasAnyName(classes)))); }; auto renameMethod = [&] (ArrayRef<StringRef> classes, StringRef from, StringRef to) { return makeRule(cxxMemberCallExpr(on(derivedFromAnyOfClasses(classes)), callee(cxxMethodDecl(hasName(from), parameterCountIs(0)))), changeTo(cat(access(o, cat(to)), "()")), cat("use '", to, "' instead of '", from, "'")); }; renameMethod(<classes>, "count", "size"); renameMethod(<classes>, "length", "size"); a.k.a qt-port-to-std-compatible-api V4 with config Scope: 'Container'. Change-Id: I58e1b41b91c34d2e860dbb5847b3752edbfc6fc9 Reviewed-by: Sona Kurazyan <kurazyan.sona@gmail.com>
* Port from qAsConst() to std::as_const()Marc Mutz2022-10-075-10/+10
| | | | | | | | | | | | | | We've been requiring C++17 since Qt 6.0, and our qAsConst use finally starts to bother us (QTBUG-99313), so time to port away from it now. Since qAsConst has exactly the same semantics as std::as_const (down to rvalue treatment, constexpr'ness and noexcept'ness), there's really nothing more to it than a global search-and-replace. Task-number: QTBUG-99313 Change-Id: Ifc205a53ed6809f98d6cd552de901ea7e90716f5 Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
* Port from container::count() and length() to size()Marc Mutz2022-10-064-8/+8
| | | | | | | | | | | | | | | | | | | | | This is a semantic patch using ClangTidyTransformator as in qtbase/df9d882d41b741fef7c5beeddb0abe9d904443d8: auto QtContainerClass = anyOf( expr(hasType(cxxRecordDecl(isSameOrDerivedFrom(hasAnyName(classes))))).bind(o), expr(hasType(namedDecl(hasAnyName(<classes>)))).bind(o)); makeRule(cxxMemberCallExpr(on(QtContainerClass), callee(cxxMethodDecl(hasAnyName({"count", "length"), parameterCountIs(0))))), changeTo(cat(access(o, cat("size"), "()"))), cat("use 'size()' instead of 'count()/length()'")) a.k.a qt-port-to-std-compatible-api with config Scope: 'Container', with the extended set of container classes recognized. Change-Id: Id816b39977e17712fd078900037efc45f66a0175 Reviewed-by: Sona Kurazyan <kurazyan.sona@gmail.com> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Replace qExchange with std::exchangeMarc Mutz2022-10-063-3/+3
| | | | | | | | | None of these users require C++20 constexpr or C++23 noexcept, the only remaining difference between std::exchange and qExchange. Task-number: QTBUG-99313 Change-Id: I3a1cc903f8298085dd2bf09a08234557e9eb430a Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Enable QtRemoteObjects example documentationJuha Vuolle2022-09-233-1/+18
| | | | | | | | | | | | | This commit adds the example listing page and a link to it on the module's landing page. The examples that had the 'qdoc' file are included in the listing. Few examples' documentation is quite limited, but those can be addresed in their own tasks as needed. Fixes: QTBUG-105943 Change-Id: Id69baead6fa5a2a62a3ce7fdf3d7e6be06cc851d Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* Port away from deprecated QRegularExpression::match() callIvan Solovev2022-08-301-2/+2
| | | | | | | Task-number: QTBUG-105102 Change-Id: Id96498dfd134614946d9668ff36748e20fbc20a9 Reviewed-by: Juha Vuolle <juha.vuolle@insta.fi> Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
* Add QList<int> metatype registration so that QDataStream worksJuha Vuolle2022-08-302-0/+2
| | | | | | | | | | | | | Recent changes in qtbase have the consequence that some of the metatypes that were previously implicitly/indirectly registered no longer are. Fixes: QTBUG-105469 Change-Id: I3a62fc46dad82c64271d62f74e466b0a54fcd2d4 Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Brett Stottlemyer <bstottle@ford.com>
* QtRemoteObjectsQml: remove dependency from unused private headerSona Kurazyan2022-08-292-2/+0
| | | | | | | | | | | | qjsvalue_p.h is included, but not used, so remove the unneeded include and dependency from QmlPrivate. Fixes: QTBUG-106003 Pick-to: 6.4 6.3 6.2 Change-Id: I161fd0bafb11af0e21778b0c9db3ada72f7bba80 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> Reviewed-by: Juha Vuolle <juha.vuolle@insta.fi>
* Add QtRO over BT LE exampleBogDan Vatra2022-08-293-1/+2
| | | | | | | | | | | | | | | | | This commit adds Qt remote object example which demonstrates remote objects over Bluetooth Low Energy (LE). The example uses GATT characteristics and their value notifications as the transport method. The source (server) side is a simple "heater" object which is either turned ON or OFF, as controlled by the client. The temperature then changes upwards (heats) or downwards (cools) accordingly. The changing temperature value is shown by the client GUI. Fixes: QTBUG-99576 Change-Id: I70dff545db0e45e3026ed5a7a98fce7bf54b9821 Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io> Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
* Change the license of all CMakeLists.txt and *.cmake files to BSDLucie Gérard2022-08-238-8/+8
| | | | | | | Task-number: QTBUG-105718 Change-Id: I3c41abc9bca22c7395fa8bbacb853e2081491d5f Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
* Add license headers to cmake filesLucie Gérard2022-07-076-0/+18
| | | | | | | | | | | | CMakeLists.txt and .cmake files of significant size (more than 2 lines according to our check in tst_license.pl) now have the copyright and license header. Existing copyright statements remain intact Task-number: QTBUG-88621 Change-Id: I645192906c25043651ee09447a2d98e70330a39c Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
* Fix race condition when accessing invalid indexElias Steurer2022-07-051-1/+4
| | | | | | | | | | | | This can sometimes happen when clicking fast on different items in debug mode. This this is a fix by Roman Putintsev. [ChangeLog][QtRemoteObjects][ModelReplica] Fix race condition when accessing invalid index Pick-to: 6.4 6.3 6.2 Fixes: QTBUG-74124 Change-Id: Ice95b4f91b50173ce804f3d664e9b12a4c74e1ce Reviewed-by: Brett Stottlemyer <bstottle@ford.com>
* SourceApiMap: De-inline dtor of polymorphic classMarc Mutz2022-06-212-2/+5
| | | | | | | | | | ... fixing Clang -Wweak-vtables warnings, which we'll soon add to headersclean. Pick-to: 6.4 Task-number: QTBUG-45582 Change-Id: I0a2962f216c2fb03e924bb94b21c0903450974c5 Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
* Fix typo in debug outputKai Köhne2022-06-201-2/+3
| | | | | | | | | s/paremeters/parameters Task-number: QTBUG-97092 Pick-to: 6.3 6.4 Change-Id: I7f3e306f5899e4834aadc4ab142f1532652fedf3 Reviewed-by: Brett Stottlemyer <bstottle@ford.com>
* Use SPDX license identifiersLucie Gérard2022-06-1479-2804/+156
| | | | | | | | | | | Replace the current license disclaimer in files by a SPDX-License-Identifier. License files are organized under LICENSES directory. Pick-to: 6.4 Task-number: QTBUG-67283 Change-Id: I315d7ce1d6c6c3497afdfe8b61a113fdc181c935 Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
* Replace Q_DECLARE_METATYPE with QT_DECL_METATYPE_EXTERNSona Kurazyan2022-06-098-12/+34
| | | | | | | | | | | | | This reduces compilation time by avoiding repeated metatype instantiations. Can't backport to Qt 6.3 or 6.2 because this change introduces new exported symbols. Pick-to: 6.4 Fixes: QTBUG-102219 Change-Id: Ice0f606bdcfa283b8eb89c57c4b06650d3f88928 Reviewed-by: Marc Mutz <marc.mutz@qt.io>
* Doc: Use find_package(Qt6 REQUIRED COMPONENTS ...) idiomKai Köhne2022-05-131-1/+1
| | | | | | | | | | | Using REQUIRED as a prefix instead of suffix works better with OPTIONAL_COMPONENTS, and is also the order in the CMake manual. Pick-to: 6.3 Task-number: QTBUG-98867 Change-Id: I02034035f8c67a1e55a826898231409c07ebd6bf Reviewed-by: Rui Oliveira Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
* repparser: add missing #include <QHash>, <QSet>Marc Mutz2022-04-051-0/+2
| | | | | | | | These headers are no longer transitively included from qvariant.h. Pick-to: 6.3 6.2 Change-Id: I9e95274d23ae1175874fc89d5e2902b2da6b17ab Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Sweep replace setObjectName(QStringLiteral(~~~)) → QLatin1StringMarc Mutz2022-04-051-1/+1
| | | | | | | | Much more efficient now that setObjectName takes QAnyStringView. Change-Id: I0d7423f6fb9aa41f1570c21ce948f1b8d0e0ff16 Reviewed-by: Brett Stottlemyer <bstottle@ford.com> Reviewed-by: Rafael Roquetto <rafael.roquetto@qt.io>
* QNX: Fix compiler warningsPasi Petäjäjärvi2022-03-252-5/+5
| | | | | | | | | | | | | warning: narrowing conversion of '(int)len' from 'int' to '_Sizet' {aka 'long unsigned int'} inside { } [-Wnarrowing] warning: narrowing conversion of 'data.QByteArray::length()' from 'qsizetype' {aka 'long long int'} to '_Sizet' {aka 'long unsigned int'} inside { } [-Wnarrowing] Pick-to: 6.2 6.3 Task-number: QTBUG-101384 Change-Id: Ia2e2c979ad668b040e0e2ba7a36f65bb91d8e18e Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
* QNX: Fix compiler warningPasi Petäjäjärvi2022-03-251-0/+1
| | | | | | | | | warning: this statement may fall through [-Wimplicit-fallthrough=] Pick-to: 6.2 6.3 Task-number: QTBUG-101384 Change-Id: I645ad99db0ddea8e8da53ac7722bc534e2c49240 Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
* Add missing qobject includesFabian Kosmale2022-03-242-0/+3
| | | | | | Change-Id: Ic6f439997f57df5bb374d901d39890dd1b1d2a0c Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
* Make sure all private headers include at least one otherThiago Macieira2022-03-086-1/+7
| | | | | | | | | | See script in qtbase/util/includeprivate for the rules. Since these files are being touched anyway, I also ran the updatecopyright.pl script too. Change-Id: Ib056b47dde3341ef9a52ffff13ef677e471674b6 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* qconnection_qnx_global_p.h: add missing Qt namespaceMarc Mutz2022-02-181-0/+4
| | | | | | | | | | | Exported or not, the library should not claim names like Thread in the global namespace if the user asked for a namespaced Qt build. Pick-to: 6.3 6.2 5.15 Change-Id: I31fc715a70923ab85d82c3407ca89c6b087eb19e Reviewed-by: Brett Stottlemyer <bstottle@ford.com> Reviewed-by: Rafael Roquetto <rafael.roquetto@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Check nullptr before using pointerZhang Hao2022-02-101-1/+3
| | | | | | | | | | | Calling QRemoteObjectHost::hostUrl() will crash if remoteObjectIO is nullptr, so check if it's not nullptr before using it. Fixes: QTBUG-85124 Pick-to: 5.15 6.2 6.3 Done-with: sona.kurazyan@qt.io Change-Id: I1f73589958ba08d3997193653b57a64a223cd201 Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
* Doc: State Qt versions for when CMake commands etc. were introducedJoerg Bornemann2022-02-091-0/+8
| | | | | | | Pick-to: 6.2 6.3 Task-number: QTBUG-100212 Change-Id: I35220805f85ebadbaffbcb32ae4654271926e155 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Fix addData() calls for upstream changeBrett Stottlemyer2022-02-021-2/+2
| | | | | | | | | | | | | qtbase commit de18b3ff370543b5b99bd068b871a2cd677cf9f3 ("QCryptographicHash: port addData() to QByteArrayView") requires passing a QByteArrayView to addData, and deprecated the overload that took a pointer and size. This fix avoids using the deprecated methods. Fixes: QTBUG-100358 Change-Id: Ic3ee2311d27fc7e5d17ecbb2953c244701c5109d Reviewed-by: Marc Mutz <marc.mutz@qt.io> Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>