summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* SQL/MariaDB: Enable MYSQL_OPT_TLS_VERSIONHEADdevChristian Ehrlicher14 min.2-2/+2
| | | | | | | | | MYSQL_OPT_TLS_VERSION is supported since MariaDB C Connector 3.1.10 so we should enable it also for MariaDB. Pick-to: 6.10 Change-Id: Iaec42fa83bf6da42295d297455f07436afeae8d3 Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* Doc: Update model/view diagrams to styled SVG versionsDavid Boddie69 min.5-4/+518
| | | | | | | | | | | | Existing images are not suitable for use with the dark theme of the online documentation. SVG files are more versatile and can be styled for the light and dark themes. Some hard-coded properties are used to ensure that Assistant's SVG renderer can display the files in a reasonable way. Change-Id: Iafb72835937f1e96598993ee61de6f384e68b50b Reviewed-by: Jerome Pasion <jerome.pasion@qt.io>
* QRangeModel: fix two more unqualified wrapped_t usesMarc Mutz4 hours1-3/+7
| | | | | | | | | One amending 4207a1664d6901322c19edddad95ec53bdd2a017, the other amending c1341b7557ce52c681618c77c17687623fc0f3b2. Pick-to: 6.10 Change-Id: Ib5db1a0728e359499a1a53d12a8157df7c3569e6 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* CMake: Replace qt_set01 with explicit if() conditionsJoerg Bornemann5 hours5-51/+176
| | | | | | | | | | | | | | | | | | | | | | | | The qt_set01 function had a critical argument quoting flaw. This happened because CMake removes quotes when calling the function, causing variable substitution in the condition evaluation. For example, calling qt_set01(QNX CMAKE_SYSTEM_NAME STREQUAL "QNX") with QNX already set to 1 would evaluate CMAKE_SYSTEM_NAME STREQUAL QNX (where QNX expands to 1) instead of CMAKE_SYSTEM_NAME STREQUAL "QNX". This particularly affected users with QNX toolchains that pre-set the QNX variable, causing configure to fail. Replace all qt_set01 calls with explicit if/else blocks that properly preserve string literals and avoid the eval-like behavior. Remove the qt_set01 function. The platform detection code is now admittedly more verbose but plain CMake without argument quoting pitfalls. Pick-to: 6.8 6.10 Fixes: QTBUG-142267 Change-Id: I642fc8582001b8c7b7b6ff56eae7ccabc89ba565 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* QRM: Only detect rotate if the iterator models at least forward_iteratorVolker Hilsheimer5 hours1-2/+4
| | | | | | | | Amends dc2521c156fb694f379104191e540a57371b41f0 Change-Id: I2a1e7da5aa5b7015ced25fcc49c1e66275db4bc8 Reviewed-by: Nils Petter Skålerud <nils.petter.skalerud@qt.io> Reviewed-by: Artem Dyomin <artem.dyomin@qt.io>
* QRawFont: de-inline two-arg advancesForGlyphIndexes()Marc Mutz5 hours2-11/+11
| | | | | | | | | | | | | | | | | Functions in which owning containers allocate should not be defined inline, because of the amount of code generated. Unlike similar changes in the past, this wasn't found by Clang -ftime-trace, but highlighted by adding GCC -Wnrvo to headersclean. Instead of rewriting the function, pull it behind the ABI boundary. Can't pick back, because it adds an exported symbol (on Unix, Windows already had it, due to the wholesale export of the class), so isn't forwards-BC. Change-Id: I0d7ac417e129023f9688028685e818e7ab6ab7e2 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* QtHeadersClean.cmake: add note about using `configure -headersclean`Ahmad Samir6 hours1-0/+2
| | | | | | | | It may be obvious for more exprienced developers, but it's wasn't obvious for me. So help the next guy figure it out. Change-Id: Iea0538b4b1efbd4729b132fc1242996bb546a02e Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Doc: Mark internal reimplemented functions as only reimplementedDavid Boddie7 hours2-4/+4
| | | | | | | | | This provides useful links to the reimplemented API documentation. Pick-to: 6.8 6.10 Task-number: QTBUG-140667 Change-Id: Ia7148b46f349357eae1f1a26a5737487371b88c1 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* Doc: Fix QDoc warnings for internal classes in Qt WidgetsJerome Pasion13 hours22-8/+138
| | | | | | | | -Internal classes should have internal class documentation. Task-number: QTBUG-141665 Change-Id: I399e0cec51a9308172301a862dcd07e6137e9854 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* QRangeModel: don't refer to wrapped_t with its unqualified nameMarc Mutz26 hours1-21/+28
| | | | | | | | | | | | | | | | This enables ADL, which might end up picking up unrelated templates from user namespaces, and, due to QtPrivate::wrapped_t in qanystringview.h, breaks TUs (such as -unity-build), where both headers are included. Amends the addition of the feature, somewhere before the bdbe4c8858e378d5b90bed799b67304d452fc0da rename to QRangeModel. Task-number: QTBUG-142184 Fixes: QTBUG-142182 Pick-to: 6.10 Change-Id: Id41ec4bca1059ab525c5c6bfad052d83572e1d91 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Add missing forwarding for channel signals in QLocalSocket / UnixAndreas Hartmetz30 hours1-0/+4
| | | | | | | | | | | | | | QLocalSocket internally uses a QTcpSocket that actually operates on a local socket file descriptor. The forwarding of what that socket does was missing for the channelReadyRead() and channelBytesWritten() signals. [ChangeLog][QtNetwork][QLocalSocket][Unix] Fixed QLocalSocket not emitting channelReadyRead() and channelBytesWritten() signals Pick-to: 6.10 6.9 6.8 6.5 Change-Id: Iacf736374e026ddb475522d4a8e8fd8c5b5564bb Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* QFlatMap: use QtPrivate::ArrowProxy instead of own mock_pointerMarc Mutz2 days1-26/+3
| | | | | | | | | | | | .. to use a common vocabulary, and share code. Amends 900d4bd29f30effbb5dbb0efa96886af03839a15, which introduced ArrowProxy for use in QKeyValueIterator and QDomNodeList::It. This is just another user I've overlooked up to now. Pick-to: 6.10 6.8 Change-Id: I2c1eecc75a209ce552ddd1fdebfc6da784c83a00 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* Add computeWindowStyles helper to window class registryPavel Dubsky3 days2-20/+43
| | | | | | | | | Introduced computeWindowStyles to centralize logic for determining window class style flags based on window type, surface type, and properties like drop shadows. Change-Id: I3c3ddeb89b462f7a25754ae51e605f1fade7cf7f Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Move hasIcon logic into computeHasIcon helperPavel Dubsky3 days2-6/+21
| | | | | | | | Introduced computeHasIcon to centralize logic determining whether a window class should include an icon, based on window type and flags. Change-Id: I4702bbb0833e90163382fb318f990c79fc0f93f5 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* QFont: fix a QT_ASCII_CAST_WARNMarc Mutz3 days1-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Says GCC: qfont.cpp:2202:81: required from here 2202 | fontDescription += comma + tag.toString() + u'=' + QString::number(value); | ^ qstringbuilder.h:403:37: warning: ‘static void QConcatenable<QByteArray>::appendTo(const QByteArray&, QChar*&)’ is deprecated: Use fromUtf8, QStringLiteral, or QLatin1StringView [-Wdeprecated-declarations] 403 | QConcatenableEx<B>::appendTo(p.b, out); | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~ qstringbuilder.h:372:43: note: declared here 372 | QT_ASCII_CAST_WARN static inline void appendTo(const QByteArray &ba, QChar *&out) | ^~~~~~~~ This is because Tag::toString() returns QByteArray, not QString. To fix, wrap the toString() result in QLatin1StringView. This is safe, because the temporary QByteArray will be kept alive until the end of the full-expression, so until after op+= has executed. It does change the serialization vis-a-vis the old code, but a) only for non-US-ASCII tags, which are not really valid, and b) we make it more robust now, because each random 4-octet sequence is a valid L1 string, but many are not valid UTF-8, so their interpretation as U8 by the old code (QByteArray → QString assumes U8) depends on behavior of Qt outside its spec. GIGO applies, of course, but we don't tend to specify the GO for any given GI, so it's better to use an algorithm for which no input is "garbage". Amends 8fe6ad3eed40a8c851bf5d49e322f9794b9f7dcf. Task-number: QTBUG-141412 Change-Id: Ic45f9147ca54201a33d953da57b768d2a5d115e4 Reviewed-by: Ahmad Samir <a.samirh78@gmail.com>
* QFlatMap: use QT_DEFINED_TAG for OrderedUniqueRangeMarc Mutz3 days1-2/+2
| | | | | | | | | | | | It applies extra safety measures for such tag types. Amends 74a87a329498422db0dea3e469fb84704accbb2b, which ought to have ported this tag struct, too. Pick-to: 6.10 6.8 Change-Id: Idd2c116d1045f4218ec74c52f8ddf00324abd59c Reviewed-by: Ivan Solovev <ivan.solovev@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* JNI: Allow clients to opt into their own exception handlingVolker Hilsheimer3 days8-240/+1010
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Detect whether the return type of a call is similar to std::expected. This indicates that the caller wants to handle exceptions explicitly, so in case of error, we pass it through the the std::expected-like value. We still clear the exception state. The caller is responsible for freeing the jthrowable local reference. For this to work, we have to propagate errors through to the outer-most function. This includes allowing QJniObject to create QJniEnvironment instances that don't implicitly return a clean environment in the destructor. As long as we can call checkAndClearExceptions() in the public functions (unless the caller opts in), this should not break any existing code that expects QJniObject to implicitly clear exceptions. Add tests for all overloads to make sure that exceptions (from wrong class or method names, and thrown in methods) are caught. Add "Impl" helpers that do not handle exceptions if instantiated accordingly, and call those if we have to maintain compatibility in public functions while also enabling opt-in handling for modern APIs. Add tests that show that we can now handle exceptions ourselves for all public QJniObject APIs. If possible, we build the test with C++23 so that we can use std::expected; otherwise, try to use tl::expected by downloading the header-only implementation from github; and failing that, use a minimal implementation of a type that could be used instead and makes the test pass. Fixes: QTBUG-93800 Fixes: QTBUG-119791 Task-number: QTBUG-92952 Change-Id: I1cfac37ac9af8fd421bc0af030a1d448dd0e259e Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
* Doc: Document the LegacyBehavior enum separately for clarityDavid Boddie3 days1-5/+7
| | | | | | | | | | | | | Improve the layout of the enum documentation by splitting LegacyBehavior from the rest of the enum values to prevent the value column from taking up too much of the page width. Mention transition details rather than times to avoid confusion about terminology. Fixes: QTBUG-141801 Change-Id: Ib995ab2af3bcddce669df818ff949b7a3e959667 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* Extract classNameSuffix helper in window class registryPavel Dubsky3 days2-23/+33
| | | | | | | | Added a new helper function classNameSuffix to generate class name suffixes based on window type, style flags, and icon presence. Change-Id: I70c20f211255d9e79fc6e7e3b79dbefd861bf7be Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* tst_QAtomicScopedValueRollback: add a check for atomic<shared_ptr>Marc Mutz3 days1-0/+29
| | | | | | | | | | | | | | | | | Unlike the non-atomic QScopedValueRollback (which has a moveOnly() test to catch such mistakes), QAtomicScopedValueRollback was missing some std::move()s in the implementation. While std::atomic<unique_ptr> is not a thing™, and we thus can't add a moveOnly() check here, atomic<shared_ptr> is, so use that to test. This won't flag missing move()s, because shared_ptr is copyable, but a check of the class for non-trivial payload types was missing, and this adds that. Pick-to: 6.10 6.8 6.5 Change-Id: Ib0ef06be9ef1a6a66564373ff74bdff35dd7b285 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* QFlatMap: remove STL-compatibility guard macroMarc Mutz3 days2-22/+0
| | | | | | | | | | The macro has been silently active since 6.5, with no way to disable it, so remove it now, after two LTS releases have been released with this new default. Pick-to: 6.10 Change-Id: Ibc12fa59707a75eb9e4a452471a83e9df206a7b6 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* tst_q23_expected: fix GCC -Wformat-zero-lengthMarc Mutz3 days1-1/+1
| | | | | | | | | | | | | | | | | | | | | | | GCC warns if a format string is statically known to be empty. Since we mark up printf-style QTest::addRow() using the resp. attribute, GCC warns here, too: tst_q23_expected.cpp:23:19: warning: zero-length gnu_printf format string [-Wformat-zero-length] 23 | QTest::addRow("") << false; | ^~ Instead of using the old newRow(), add some content to the data tag instead. It cannot be left unmentioned that this test doesn't test ... very much. I hope we don't use this component in production code, yet... Amends 4e9f4d5d02e29b4522540b8f9b9b01b7e57a6b54. Pick-to: 6.10 Change-Id: I50ebb074997e034506c6602ff7602ad392b745be Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Tim Blechmann <tim.blechmann@qt.io>
* Http: properly handle a connection: close state when server disconnectsMårten Nordheim3 days1-0/+4
| | | | | | | | | | | | | | | We already somewhat do this, but possibly due to version differences the path in _q_error is not reached on certain Windows systems. Add the same path checking for 'no content-length specified' in the slot to handle the socket disconnected() signal, though unlike the _q_error path we don't need to do a queued invoke - the socket is definitely already disconnected. Pick-to: 6.10 6.8 Change-Id: I65bcab18bd3de80c26a1a5f88e8ffd2840cfa291 Reviewed-by: Øystein Heskestad <oystein.heskestad@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* wasm: Refactor PromiseEven Oscar Andersen3 days5-6/+738
| | | | | | | | | | | | | | | | | | | | | | | | Switch from a function based implementation to making Promise a object. Maps straightforward to a javascript promise, except for this: We need to do cleanup when the promise has been fully processed. We do this by adding a final handler. However, the handlers are called in the order they are added, so the final handler we add in the constructor will be executed too early. We solve this, in a non optimal way, by adding a final handler after each then, and catch, handler. This makes the interface easy to use, even if it is suboptimal Fixes: QTBUG-142138 Change-Id: I6be3f102e838467cc98f4a9825fd5f6fe0e1e1a2 Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
* wasm: Remove promise manual testEven Oscar Andersen3 days3-521/+0
| | | | | | | It will be replaced by an auto test Change-Id: Ie7bc9acba6080fd191e31e61ce378023003b599c Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
* Wayland plugins: replace header guards with #pragma onceMarc Mutz3 days17-176/+18
| | | | | | | | | | | | | | | | | | | | | | Following qtbase/1c8884fc277c5916a420a3c14de68547a391f9fc's making syncqt error out when an installable header contains #pragma once, we can now flip the coin and use #pragma once as a static assertion that the given header is not going to be installed, making it easier to understand which headers are "public", which ones are "private" and which ones are "neither, since never installed". Do this for the Wayland platform support files, like 91f9ba2993a2652bcb349ce639aff67b5bfc8938 did for XCB. Since these headers are neither public nor private, also remove "We mean it" comments, where they existed. Had to exclude the QtWlShellIntegration headers, because, for some unknown reason, we install headers from the plugins/ subdir. Pick-to: 6.10 Change-Id: I92f336f79d23134e96cbac13088dbd352e2d3a84 Reviewed-by: David Redondo <qt@david-redondo.de>
* Add check for -Wcharacter-conversion supportMorten Sørvig3 days1-1/+1
| | | | | | | | | | | | | | | | | Use __has_warning() to check if -Wcharacter-conversion is supported before disabling it, in order to avoid "unknown warning" warnings. This is/was a problem when building with Emscripten 4.0.7, which uses a git snapshot of Clang 21 which does not support the warning. Amends f20f12baab1f40ec0aad2635186e7d270139509b. Pick-to: 6.10 Change-Id: I4c08e69013b36b87709295d9a3a79d8986078ef1 Reviewed-by: Marc Mutz <marc.mutz@qt.io> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* Remove unused headers from qnetworkaccesscachebackend_p.hMate Barany3 days1-2/+0
| | | | | | Pick-to: 6.10 Change-Id: I728ff9a9b699d776d2aaf54b943f567ab962d6bf Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* Docs: Add note about need for <!-- %%INSERT_PERMISSIONS -> in ManifestSheree Morphett3 days2-1/+9
| | | | | | | | | | | Added a note to the qt_add_android_permission documentation clarifying the need for INSERT_PERMISSIONS to be present for it to work with the API. Fixes: QTBUG-138568 Pick-to: 6.8 6.10 Change-Id: Ibb7a5594ae731f3c64582ea27db329a582a94d5b Reviewed-by: Nicholas Bennett <nicholas.bennett@qt.io>
* QFont: add a code comment about an op<() observationMarc Mutz4 days1-0/+2
| | | | | | | | | | | | | | | | | The code consistently treats the op<() argument as the LHS and *this as the RHS, so it actually implements greater-than. Nothing that needs changing, as the docs don't promise anything and it's perfectly fine to implement op< using greater-than semantics, if done consistently, but worth nothing, because it may raise eyebrows, as it did in this author. Amends the start of the public history. Pick-to: 6.10 6.8 6.5 Task-number: QTBUG-142246 Change-Id: If5aafa4e01a963e622c1ad72deb265477855ec48 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* tst_QString: make an array constexpr and init from char16_tMarc Mutz4 days1-1/+1
| | | | | | | | | | | | | | | | | This re-applies to dev the relevant changes from the 6.5/6.8 picks of 7bf27b88eafbc54762cdeb28c9202bb7e080b308, which this patch amends. In those older branches, fromRawData() wasn't overloaded for char16_t, yet, and, changing to use a QChar array instead, I had to change the initializer to char16_t literals and added constexpr to guaranteee constant-initialization. Since these changes are already in 6.5 and 6.8, it suffices to pick to 6.10. Pick-to: 6.10 Change-Id: Ib5da4c7a61c34d1db7be8f8fb4c6e197d4fc42fe Reviewed-by: Ahmad Samir <a.samirh78@gmail.com>
* Add shouldDecorateWindowClassName to detect window class conflictsPavel Dubsky4 days2-6/+20
| | | | | | | | | | Introduces helper overloads that return true when a window class with the same name is already registered but uses a different window procedure. This will be used to decide when to register a new class with a decorated (UUID-suffixed) name. Change-Id: I613173e61152a6f717285a1d4943b01808c1a44e Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Simplify WNDCLASSEX initialization in window class registryPavel Dubsky4 days1-10/+1
| | | | | | | | Replaced manual field-by-field zeroing with aggregate initialization and removed redundant assignments of default values. Change-Id: Ic2e974ef859d3142ae2077ef306403423c979d10 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* CMake: Automatically generate a vcpkg manifestJoerg Bornemann4 days15-28/+774
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ChangeLog][configure] Added a -generate-vcpkg-manifest configure option. This generates a vcpkg.json file in the build directory. To just generate the manifest without configuring Qt, run configure with -generate-vcpkg-manifest -dry-run. [ChangeLog][configure] When configuring with -vcpkg, generate a vcpkg manifest file in the build directory, and set VCPKG_MANIFEST_DIR to the build directory to use that manifest file. You can turn off the manifest generation with -no-generate-vcpkg-manifest. You can turn off setting the manifest directory by passing -- -UVCPKG_MANIFEST_DIR to configure. Configuring with pure CMake won't generate a vcpkg.json. This patch adds a low-level CMake API for creating vcpkg manifests in QtVcpkgManifestHelpers.cmake. The functions qt_find_package and qt_feature gained arguments for creating dependencies in the manifest and add them to features. This adds a package dependency (not guarded by any feature): qt_find_package(WrapSystemFreetype 2.2.0 MODULE ... VCPKG_PORT freetype VCPKG_VERSION 2.3.4 ) This adds a package dependency `freetype` to the feature `freetype`: qt_find_package(WrapSystemFreetype 2.2.0 MODULE ... VCPKG_PORT freetype VCPKG_ADD_TO_FEATURE freetype ) This adds a feature `freetype` with `gui` as its "parent dependency": qt_vcpkg_scope(gui) ... qt_feature("freetype" PUBLIC PRIVATE SECTION "Fonts" LABEL "FreeType" PURPOSE "Supports the FreeType 2 font engine (and its supported font formats)." ) If features are turned on/off via configure arguments, we set the CMake variables VCPKG_MANIFEST_NO_DEFAULT to ON and VCPKG_MANIFEST_FEATURES to the list of corresponding vcpkg features to only install libraries that are needed for the build. For a per-repo build, we create a vcpkg.json with dependencies only for that repository. For a top-level build, we create a vcpkg.json with all dependencies of all repositories, excluding those that have been skipped (with configure's -skip argument). Task-number: QTBUG-73760 Change-Id: I6cc449d712f32d9e564acecaede5a7b31f309a8c Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* configure: Add -dry-run optionJoerg Bornemann4 days2-0/+20
| | | | | | | | | This option prints the effective CMake command but doesn't execute it. This is useful for debugging or for triggering configure side effects without actually calling CMake. Change-Id: I2f2831f4a41bbcf6cd3117bd4a3e773577447975 Reviewed-by: Alexey Edelev <semlanik@gmail.com>
* Unexport QCocoaSystemTrayIcon from Cocoa platform pluginTor Arne Vestbø4 days1-1/+1
| | | | | | | | We don't export symbols from the platform plugins. Pick-to: 6.10 6.8 6.5 Change-Id: Id3d801aba8b9fa59af9317602abffe6451be4c80 Reviewed-by: Tim Blechmann <tim.blechmann@qt.io>
* Rename m_proc to m_defaultProcedure in QWindowsWindowClassRegistryPavel Dubsky4 days2-5/+5
| | | | | Change-Id: I56a25033843c3c1ced047fe3e9072ee6014d182c Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Wayland integration plugins: fix QT_END_NAMESPACE locationsMarc Mutz4 days4-11/+8
| | | | | | | | | | | | | | | Harmless, because QT_END_NAMESPACE is also just '}', but eyebrow-raising, so fix. Amends: - d8e37e4b03f9c786e1cb3dda80b050f05f974752 - 3bf9a581ee13cac988cdfadc7f22d472c1562214 - c2f156e27bf8865dc12108e1aba7cc78bd0dba38 - 6482bf50754e36a89e157ce94096be05b108db75 Pick-to: 6.10 Change-Id: Id59044023bfaf75ddc2bff024439f3d4a20d0936 Reviewed-by: David Redondo <qt@david-redondo.de>
* Wayland hw-integration headers: don't include yourselvesMarc Mutz4 days4-4/+0
| | | | | | | | | | Harmless, but ... eyebrow-raising. Amends 58e68f1981d0ba0a80e373dd5ca78a9260824c36. Pick-to: 6.10 Change-Id: Id5754a772c1e3244a88294390c98604bfe07f0ad Reviewed-by: David Redondo <qt@david-redondo.de>
* CMake: Allow adding tools dependencies on INTERFACE librariesAlexandru Croitor4 days7-9/+44
| | | | | | | | | | | | | | | | Rename the QT_EXTRA_TOOLS_PACKAGE_DEPENDENCIES property to _qt_extra_tools_package_dependencies so we can set it also on INTERFACE libraries with older CMake versions. Remove the check for is_interface_lib in qt_internal_create_module_depends_file so we can add tool package dependencies with qt_record_extra_qt_main_tools_package_dependency on INTERFACE libraries as well. Use the new feature in the StandaloneToolsPackage RunCMake test. Change-Id: Ia36acf785f5f8512580dfcd3e599a5e704f9422e Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* CMake: Allow creating a standalone Tools package without a moduleAlexandru Croitor4 days16-65/+516
| | | | | | | | | | | | | | | | | Add a new qt_internal_add_tools_package function to allow creating a standalone Tools cmake package. It can be useful for a repo which might build e.g. an arch-independent java tool exposed by an IMPORTED executable, but has no associated C++ Qt module. Also add a qt_internal_record_tools_package_extra_third_party_dependency function to allow looking up additional third party cmake packages when finding the tool package. Change-Id: I46f5fb9f7a361ecf4018f0fc1ed0a1f8ecf12df3 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* QObject: optimize err_ functions for sizeMarc Mutz4 days1-10/+25
| | | | | | | | | | | | | The compiler cannot look into format strings and extract common parts for us. We need to do it manually. Saves more than 400B in text size on optimized GCC 15 C++26 unity AMD64 builds. Pick-to: 6.10 6.8 6.5 Change-Id: Ia8db139d9a1fc219a84eaec42c6f72dc9dc9d135 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Ahmad Samir <a.samirh78@gmail.com>
* QRangeModel: port some predicates to qxp::is_detectedMarc Mutz4 days1-23/+18
| | | | | | | | | | | | | | | It's easier to read, and involves less class template instantiations. As a drive-by, refer to wrapped_t using qualified lookup, to prevent ADL injections. There's much more whence these came. Created QTBUG-142184 to keep track of the general issue. Amends 8edabea2a76192788d30afc22e2ebcb560195401. Task-number: QTBUG-142182 Pick-to: 6.10 Change-Id: I1a54b904df4e0204a7909ea10845acccb539866b Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Add public interface for dynamic feature java binariesLauri Pohjanheimo4 days2-0/+51
| | | | | | | | | | | Dynamic Feature functionality requires java classes in jni interface to enable google play feature delivery functionality. This function adds public interface to add java source folder to the build. Task-number: QTBUG-124600 Change-Id: I77e87f752cfb74b734dc34470e39b279d11868a6 Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Revise comment on recently-changed test-caseEdward Welbourne4 days1-1/+1
| | | | | | | | | | | | | | | Amends commit 3a711ad61926adfc3a57adf9fd83588efdf20b28 - CLDR v48 update. That changed a test-case to use an apostrophe in place of a right single quote as the grouping character for Swiss German (which thus now matches C++). I forgot the change the related comment on the test-case at the same time, leaving it still claiming right single quote. Updated now. Thanks to Sune Vuorela for spotting the omission. Test is new in dev so no need to pick back to older branches. Task-number: QTBUG-141949 Change-Id: I599bc8c9a302891a739ee247e675f899302e742a Reviewed-by: Mate Barany <mate.barany@qt.io>
* QSpiMatchRuleMatcher: fix clazy-reserve-candidatesMarc Mutz4 days1-0/+1
| | | | | | | | | | | We know the final size of m_interfaces, so reserve() the container. Stops the line from flashing yellow in QtCreator. Amends 7a478ff96f27fbfc8ddfbc67ba62276580aa02b4. Change-Id: I51464d3385a2142ea3782dab770bbc85003f592d Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
* QSpiMatchRuleMatcher: reduce QList indexing by 32xMarc Mutz4 days1-1/+2
| | | | | | | | | Drag the constant out of the loop. The compiler likely won't. Amends 7a478ff96f27fbfc8ddfbc67ba62276580aa02b4. Change-Id: I16bd27c6c77d518933a5509a2f7fafb74c7175ac Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
* Windows11Style: add and use inputFillBrush()Christian Ehrlicher5 days2-11/+29
| | | | | | | | | | | | Input widgets have a slightly different styling as there is no 'pressed' state but an 'edit' state. The coloring for this state is also a little bit different (fillControlInputActive). Therefore add a corresponding function to controlFillBrush() to handle this case. Pick-to: 6.10 Task-number: QTBUG-142129 Change-Id: I5b2bf971cb5c7eb2ff8d63ffd381bfe7af659e9a Reviewed-by: Wladimir Leuschner <wladimir.leuschner@qt.io>
* Use categorized logging for window class (un)registration failuresPavel Dubsky5 days1-3/+4
| | | | | Change-Id: Ib4afaf179bed99bdbb1be6fc7deebbdb2e6d1627 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* QSpiMatchRuleMatcher: prevent size() → int narrowingMarc Mutz5 days1-2/+2
| | | | | | | | | | Qt containers has qsizetype size_type since Qt 6.0. Don't use int for sizes. Amends 7a478ff96f27fbfc8ddfbc67ba62276580aa02b4. Change-Id: If6bd90150e361982624609d80abdc7b512a770e3 Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>