summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* SignalDumper: fix UB (data race on ignoreLevel)6.5Mårten Nordheim2023-10-181-1/+1
| | | | | | | | | | | | | | | ... by making it thread_local. It is written and read by multiple threads at the same time, so it needs to be protected. Since signal emission start and end happens in a single thread, keep it thread_local rather than using an atomic. Change-Id: I98fc5438c512b45f936318be31a6fccbe5b66944 Reviewed-by: Marc Mutz <marc.mutz@qt.io> (cherry picked from commit 744e9a69ab4965561529f66d8872b6c2455f4fca) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 73cae2903bb009db17bdf0d4d5ba7685f7974761) Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* Android: bump Android target API level to 33Assam Boudjelthia2023-10-186-12/+12
| | | | | | | | | | | To follow latest Play Store requirement. Fixes: QTBUG-112637 Change-Id: I1ef4f8b639f4b0cc759a2363b7b9b9864b159509 Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io> (cherry picked from commit b74f180ac065741783dc4e7f793bb97e35aed7f7) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit b33b0b607abd48771aa02b8d5629e9e4bf471f07)
* Move qpointer.cpp → qpointer.qdocMarc Mutz2023-10-182-1/+1
| | | | | | | | | | It contains no implementation. Proof: it includes no headers. Change-Id: I64b42ce799eec05a0faff2021e2b60460695e192 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> (cherry picked from commit 3321101d8f199f998c9f2b27d997000c38a30454) Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> (cherry picked from commit b539aa0192c1b885e19c6849baa334bf5d483e62)
* SignalDumper: fix UB (data race on indentation level)Mårten Nordheim2023-10-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | ... by making it thread_local. As a natural (and welcome) side-effect, this makes output look sane in multithreaded scenarios. As for why it should be thread_local instead of an atomic: Since signal emissions and slot invocations on one thread are not necessarily correlated with another thread, they should not affect one another's indentation level. As in, emitting QIODevice::readyRead on a background thread should not make QEventLoop::aboutToBlock on the main thread be indented. The only exception to this is BlockingQueued, where one thread is directly tied to another (QTBUG-118145). But slot invocations are anyway not currently printed for Queued connection (see QTBUG-74099.) Change-Id: Iea1fc522d37626df14af419a3455a732729edf74 Reviewed-by: Marc Mutz <marc.mutz@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> (cherry picked from commit ae0d231c96ab93ec36c7202c268507314eb40116) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 41feba789e56e56887be624851ccbdfcbc401de1)
* QThread/Unix: don't hardcode OSes for PThread cancellation supportThiago Macieira2023-10-181-2/+2
| | | | | | | | | | | Instead, check the macro that we're about to use. This is also done in qprocess_unix.cpp Change-Id: I8f3ce163ccc5408cac39fffd178d657b7594d07a Reviewed-by: Marc Mutz <marc.mutz@qt.io> (cherry picked from commit dec72d165be9470ef8fa46901260fa1dc32d8568) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 19ad8769639637099b6f02c17c113125683ab2c6)
* Allow Qt components be OPTIONAL when building standalone testsAlexey Edelev2023-10-181-1/+1
| | | | | | | | | | | | | | | We look for all Qt components when attempt configuring standalone tests. If some 3rdparty dependencies are missing in user environtment the configuring proccess will fail even if the dependency is not used by the standalone tests. Avoid requiring the Qt components, so users will see only warnings about the missing comonents or dependencies. Fixes: QTBUG-117709 Change-Id: Iecce40449cdf116f1a7c279ebb161f0f5c7f6a9f Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit 039257038533467d5b72ff2523c6d0db688f6f7d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit f0286b60bacb16df2b33c8e270f6e98d64626381)
* QAtomicScopedValueRollback: fix UB (passing rel/acq_rel to std::atomic::load())Marc Mutz2023-10-181-2/+20
| | | | | | | | | | | | | | | It's explicitly undefined behavior to pass release/acq_rel memory_order to load(), so don't. This is private API, so no ChangeLog needed. Reported-by: Fabian Kosmale <fabian.kosmale@qt.io> Task-number: QTBUG-115107 Change-Id: Iee119303d790c31937238ef92d900a25020e9713 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit 5797f29e8c249e13da6285ae9b2d50fff4ffb505) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 401950a76f26f9827715eaf0df7fcc4076aaf151)
* QDateTime: improve docs about invalid vs valid datetime relationIvan Solovev2023-10-181-4/+12
| | | | | | | | | | | | | Extract the information about the relation between invalid and valid datetimes into a snippet, and include it in the documentation of every relational operator. Pick-to: 6.2 5.15 Change-Id: I61b239647efe928eb0758cfc5649b33ab4d06c7d Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> (cherry picked from commit 9e26f1da0b0dedf7ee6d860b7c11a27b0b554866) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 90c65ca19706f77c2b866ffb09b350419e2e5d64)
* Windows: Don't re-apply application badge if one has not been setTor Arne Vestbø2023-10-181-1/+2
| | | | | | | | | | | | | | | | | We need to re-apply the application badge when the color scheme changes; when a task bar button is being created for the fist time; or after Explorer has crashed and re-started. But we should only do that if the user has set an application badge via our APIs. Otherwise we might end up clearing an existing badge that was set via the native APIs directly. Fixes: QTBUG-118117 Change-Id: I1f1fecba44c118d4e3f7ef4119139c3ebd23f047 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> (cherry picked from commit 8f2828683e2ac44a282e8f061de1c76925abcec1) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 6e2f3118731d13839faf63077cba1d141e7c0af5)
* eglfs: extend configure test for egldeviceSamuli Piippo2023-10-181-0/+1
| | | | | | | | | | | | Amend 1aba24a2ed4b75551a900772320d5a0dc1960043 and add check for the EGL_DRM_MASTER_FD_EXT now used as older egl headers might not have it. Change-Id: I98b860d05396c24b8eb0e73172ac395c89da8628 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io> Reviewed-by: Alex Bu <alex.bu@qt.io> (cherry picked from commit 38cc03c9af6ad5328c2dc0b1fda9ef59ae1d20aa) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit a52ca1f24e9b0f131a432fddb4021e6277bbda21)
* QCoreApplication: use the correct typedef of `preRList`Ahmad Samir2023-10-181-5/+5
| | | | | | | | | | | | | | | | | | | | | | | `QVFuncList` and `QStartUpFuncList` are identical typdefs (`QtCleanUpFunction` and `QtStartUpFunction` are identical typedefs): typedef QList<QtCleanUpFunction> QVFuncList; typedef QList<QtStartUpFunction> QStartUpFuncList; So from the compiler's POV QVFuncList and QStartUpFuncList can be used interchangeably, but from a code reader's POV, this is confusing. Use IILE to make the local variable const. This amends commits 942922652481347659a0dae78758c334778a58d2 and a887891271a52b2546265c13c6dc70fdd08507e3. Pick-to: 6.2 5.15 Fixes: QTBUG-117242 Change-Id: I67f6af89027fe36a1915e815acd3c9446f7dcd5d Reviewed-by: Marc Mutz <marc.mutz@qt.io> (cherry picked from commit 408799de65aaa4adcc6660c444f98bfb1a326dfe) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 1c359e6ea1a55d954239f11dfa90aa1beecc4501)
* Windows QPA: remove SWP_NOCOPYBITS for plain movesTimothée Keller2023-10-181-4/+8
| | | | | | | | | | | | | | | The SWP_NOCOPYBITS flag helps suppress some jittering during resizes. At the moment this is called even for plain moves with no window resizing. Make sure that the window geometry has changed before applying the SWP_NOCOPYBITS flag Fixes: QTBUG-115992 Change-Id: Ic0cb32d9eb3b557bf2b2ef5b6ba80d34e27c5c19 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Pavel Dubsky <pavel.dubsky@qt.io> (cherry picked from commit 9a64449cc353a35b37518ba4fcc62439877f6f10) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 5d292c44827d4c36370c47dda39cd2e14baa3005)
* Prevent state change of selected LineEdit in QWindowsVistaStyle when hoveringWladimir Leuschner2023-10-181-8/+8
| | | | | | | | | | | | | | Hovering over a selected LineEdit gives the selected state precedence over hover state. Fixes: QTBUG-117606 Change-Id: Ia52ce94443100bf3fb5d83b8dffa2752818ca33d Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Santhosh Kumar <santhosh.kumar.selvaraj@qt.io> Reviewed-by: Timothée Keller <timothee.keller@qt.io> (cherry picked from commit 4f51742ee12bea211b2fd0abd50a700e69a9a95c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit abb26af8341c25f522a279723e577c835d9115ac)
* Doc: Improve documentation for qInstallMessageHandler()Kai Köhne2023-10-182-47/+63
| | | | | | | | | | | | | | | | | | | | Mention that QtMessageHandler needs to be reentrant, as well as other caveats. Mention QLoggingCategory, so people do know that they don't have to necessarily implement their own handler to filter messages (and that not all messages reach the handler). Also mention qFormatLogMessage(). Finally, give a more useful example for a custom message handler that logs to a file. Note that the example leaks a file handle at exit, but that is arguably not that bad. Change-Id: I5be44167b266c9bbdbb0e94806bb024c9b352a32 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> (cherry picked from commit cb841b449a22d6646e148cd7e9d58be5ef5de27c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 740104872d08d46ea97e871565b4332824e62120)
* CMake: Fix Qt toolchain file recursive inclusionTasuku Suzuki2023-10-181-1/+1
| | | | | | | | | | | '.' in the regexp must be escaped. e.g. "/qt/toolchain.cmake" matches "/qt.toolchain.cmake$" Change-Id: Ib6b66349e1619908a33b4a11d79f7ba19d0e8fdc Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit 6544a23603b46c1e2e7c4bd7728ec4dbdb6aec16) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 08e431956a9551312d954d7d91063ee3125bff4b)
* Revert "Windows QPA: Move transient children with a window move"Timothée Keller2023-10-182-52/+0
| | | | | | | | | | | | | This reverts commit 530d092eae0579bbb88e95f853715cac214da636. Reason for revert: Moving transient children as a whole is too broad, and forces unrelated windows to have their position completely dependent on a transient parent. Fixes: QTBUG-117779 Change-Id: I01312e26e95c8144c392eca33aec41f54aaa40b0 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> (cherry picked from commit 614e0f1daa9da2c285e2fd3868f7ebfa9837164c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 19471b215df898d605962473ce403f6f4793a549)
* Add the missing QtGui/qtgui-config.hAlexey Edelev2023-10-171-0/+1
| | | | | | | | | | | | QT_NO_OPENGL is defined in qtgui-config.h so we should include it before checking the definition. Fixes: QTBUG-115446 Change-Id: I29b9d7d89fe4c079ca0cf767a1b1a63cc5621623 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit 2b6270af24b236dc329b7deab8f0ea9916af2e1a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 192c343582a647cdb918cabfc359c63845e7b996)
* http2: When a reply is removed from the queue, only remove oneMårten Nordheim2023-10-172-11/+59
| | | | | | | | | | | | | | | | | | | | | We were using the .remove(Key) API on the map instead of erase(iterator), so we were removing any reply of the same priority that had not yet been popped from the queues. Rewrote to drop loop and only work with iterators. This issue was there since SPDY days, so not picking all the way back to 5.15, where HTTP2 anyway is not enabled by default. As a drive-by, drop the #ifndef QT_NO_SSL, which was also there from SPDY times, which was TLS-only. Pick-to: 6.2 Fixes: QTBUG-116167 Change-Id: Id7e1eb311e009b86054c1fe3d049c760d711a18a Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> (cherry picked from commit 13c4e11c49d16d6a83a142215d28e1ec660e1bba) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 44e53b3ed9fc938267b492cae30e97896dbf3bb9)
* QAccessibleComboBox: Cleanup comboBox() callsLiang Qi2023-10-171-51/+65
| | | | | | | | | | | | | | Handle comboBox() returning nullptr. Avoid repeated qobject_cast by calling comboBox() once per function. Fixes: QTBUG-115161 Pick-to: 6.2 Change-Id: I3d102cebe807da379fa4d9ee2aee1e72b8fdf004 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit fc556e3571b7e2d7fe307778b17e6cf0ff9e1bfc) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 718bb11701e768c64cb68cfca48baab2cc2e1727) Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>
* Revamp Bindable Properties exp: Revisit documentationRym Bouabid2023-10-162-2/+3
| | | | | | | | | | | | Remove "Example" from the title. Add \examplecategory Data Processing & I/O Fixes: QTBUG-114689 Change-Id: I695df195819cc371d404c4c5f01a0c4830d9c438 Reviewed-by: Ivan Solovev <ivan.solovev@qt.io> (cherry picked from commit 9d32288a3806fb7d7ac938e71d7d49702b16be93) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 00da474fcaa7ac7fa81c4765656a91245040e535)
* Doc: Fix link to renamed setIncludesSubDomains() methodKai Köhne2023-10-131-2/+2
| | | | | | | | | | | | Fix capitalization of setIncludesSubDomains(). While a it, make the links explicit, so that qdoc generates warnings if they fail. Change-Id: I74542c288083ec58f866a616da32bd40fcb3f40a Reviewed-by: Andreas Eliasson <andreas.eliasson@qt.io> Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> (cherry picked from commit 1b5402d2291f16403518ecb69b68ad73b9dd76df) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit ab2ebd86a2b8957b3e3b24777d009f2a140684e2)
* Handle ACTION_POINTER_UP with tablet eventsJuha Vuolle2023-10-132-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | The ACTION_POINTER_UP is used when a non-primary pointer (touch, mouse stylus, eraser) goes up. Without handling this action in these cases, the table event remains in 'down' state (misses the QEvent::TabletRelease) and as a consequence when it is next put on the screen, eg. a line will be drawn to the new position (in case of a drawing application). In addition use getActionMasked() to get the action; non-masked events would contain the index of the pointer too, and wouldn't match with ACTION_POINTER_UP whose numeric value is 6. Rather the actions would be in the lines of: 261, // ACTION_POINTER_DOWN(1), 6 with getActionMasked() 517, // ACTION_POINTER_DOWN(2), 6 with getActionMasked() And so on. Fixes: QTBUG-86297 Change-Id: I1b50ca4d19b611aec8a5c280ed0521e2f11797b0 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> (cherry picked from commit 3ee57b83870567d52acc00e534ef022a6d3b150e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit c17a1432cf63b225c05ce2779fbecb83111870bc)
* tst_QPointer: add checks for CTADMarc Mutz2023-10-121-0/+42
| | | | | | | | | | | No pathological findings :) Pick-to: 6.2 Change-Id: Ifbbca223a5e612e7abb67c0364d4354a9d8174e3 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> (cherry picked from commit 1cf0f8e7c3feb923ff08247d83d185c6aea986eb) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit e4f5d86f88a5345257964bf4db56520d852ead83)
* Doc: Highlight some examples for the "Graphics & Multimedia" categoryKai Köhne2023-10-121-0/+2
| | | | | | | | | Task-number: QTBUG-117211 Change-Id: I9ebe20719ad96b0d9ced40745eb6ee09d3e6fb40 Reviewed-by: Andreas Eliasson <andreas.eliasson@qt.io> (cherry picked from commit bb781bdb2dd386307446a1e8740402eab74bbc5f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 0eb0f10a3e550d16b07e1ee9336fa48504451e2d)
* Remove Custom Type Example and Custom Type Sending ExampleRym Bouabid2023-10-1223-215/+162
| | | | | | | | | | | | | | | | | | | | | | | | The whole Q_DECLARE_METATYPE part is superfluous in these two examples, as QVariant works with any type as long as it is copy-constructible. And QVariant will call the equivalent of qRegisterMetaType, so that doesn't need to happen, either. Showing how to integrate the type with qDebug is fine in theory, but also a repetition of content that can be found in other places. Given that there isn't much else being shown in these two examples, it's better to remove them from examples and move them to manual tests. Some parts of "Custom Type Example" were used as snippets in other documentations under qtbase/src/corelib. So, they were added in customtypeexample.cpp file in the snippets folder. Fixes: QTBUG-117001 Change-Id: I45b16338912e3f7394cbb5169642bd31af32d5e1 Reviewed-by: Ivan Solovev <ivan.solovev@qt.io> (cherry picked from commit b956fec7eed57713faa5736917661280e5cec16c) Reviewed-by: Tatiana Borisova <tatiana.borisova@qt.io> (cherry picked from commit cf631ab8d29aad4633af87ce787ac7eb1e818298) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* qC{Debug,Info,Warning,Critical}: add parentheses around macro argumentThiago Macieira2023-10-121-1/+1
| | | | | | | | | | | | | | | | Amends ef9fe7a99a9a6779e7133167fe84426bfe9cc371 and fixes some rare cases where the macro argument wasn't a single token, such as what was found in PySide code: qCDebug(*category, "%s", %2); Fixes: QTBUG-117153 Change-Id: I85599ea5ca7a4b79a8bbfffd178a51023648f244 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Marc Mutz <marc.mutz@qt.io> (cherry picked from commit 964b9d7cd4c344b34d999b4d7f5e8185d02d3dac) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 0088e32f8e6987384ebe0d083277d02c87cc8b63)
* Fix inactive palette in gtk3 themeSanthosh Kumar2023-10-121-87/+123
| | | | | | | | | | | | | | | | | | | In gtk3 theme, the inactive color group had been set with incorrect palette or not been set for some cases, which leads to glitch when moving application window. This is because inactive group palettes were applied during window movement and its expected to be set with correct palettes. This patch fixes this issue by setting correct palette for inactive color group. Fixes: QTBUG-112879 Change-Id: I6658843626f322fee0ef99dfafb550956e3e0aee Reviewed-by: Jonas Karlsson <jonas.karlsson@qt.io> Reviewed-by: Axel Spoerl <axel.spoerl@qt.io> (cherry picked from commit a608a7c29886fd95ea8569776036673e6c7639f2) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 18a8b8f3c6d6bff6d646599572c59b09e97e34b0)
* a11y atspi: Update text-attribute linksMichael Weghorn2023-10-121-3/+3
| | | | | | | | | | | The previous ones no longer lead to the corresponding documentation. Change-Id: I3f56ad71fa3f936898a25f20f718c7f65a0385a2 Reviewed-by: Liang Qi <liang.qi@qt.io> (cherry picked from commit 0699ef13017b93c3b5f85f461d284fb7815c1011) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit e13917ec1436c9a1b4676b8fa7dd69de5bd4ab4d)
* Make \brief of Saving a Game to File actually briefEdward Welbourne2023-10-111-2/+1
| | | | | | | | | | | | | | Specifically, prune it to fit on a single line. Much of what it was saying was implicit in its context already. It also neglected to mention CBOR's part in the story. Task-number: QTBUG-111228 Change-Id: I161a345cbbea8b706490fcbbadecd01b8946af31 Reviewed-by: Konrad Kujawa <konrad.kujawa@qt.io> Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit e67f030600886a5630e22fa912e22087a7d63c56) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit f435aeb9048e9f83f343c961925bcde31d58b972)
* Replace the image to illustrate the Serialization ConverterEdward Welbourne2023-10-111-0/+0
| | | | | | | | | | | | | | | | The old image wasted a log of space, was poorly legible and showed little more than the cbordump example's illustration shows. Make explicit that we get an initial CBOR file from savegame, show how it can be converted to and from XML (idempotently) and still find space to show the same thing as before. All more legibly and in a smaller file. Task-number: QTBUG-111228 Change-Id: Ifc599d0dd646f136ccd2860ca927186d478b0fb9 Reviewed-by: Tatiana Borisova <tatiana.borisova@qt.io> (cherry picked from commit b9787a3985e503a51115da6a7282eb27f1958c64) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 7bd8ab49174c1b3ae13b023f6dbe159f678dcea1)
* Support the TZDIR environment variableEdward Welbourne2023-10-111-24/+49
| | | | | | | | | | | | | | | | | | | | On Linux / glibc, this overrides the default system location for the zone info. So check for files there first. Break out a function to manage the trying of (now three) zoneinfo directories when opening a file by name relative to there. Fixed conflict caused by petty change (s/mid/sliced/) on dev, not present in 6.5. At the same time, fixed the misplaced return that the dev version of this introduced, thereby effectively cherry-picking commit 59bf9160cc285bac1732fd3ade2ac033b2348b28 as well. Task-number: QTBUG-116017 Change-Id: I1f97107aabd9015c0a5543639870f1d70654ca67 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> (cherry picked from commit 569dc0de50a46b64763921199a2706ab34d151a9) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit f39f1bfd9e5844a1cbbe8dbcbe6d75c5a67e14ab) Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* Use the modern name for zone Asia/KolkattaEdward Welbourne2023-10-111-3/+6
| | | | | | | | | | | | The old name Asia/Calcutta is being phased out. We can't assign QTzTZP, so select between new name and old using a reference variable. In the process, fix a QCOMPARE() against bool to a QVERIFY(). Change-Id: I7cd8a813f8a88c8ae4ba07213f04f4ad0860cec0 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> (cherry picked from commit c0cb616c1d62a90e612bd64d427f37ac11a5a473) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 2b253e4ef3620ac48eabc7a6297732582269727b)
* xkb: fix build with libxkbcommon 1.6.0 and laterLiang Qi2023-10-111-0/+4
| | | | | | | | | | | | | | A few XKB_KEY_dead_* defines got removed from 1.6.0. See also https://github.com/xkbcommon/libxkbcommon/blob/6073565903488cb5b9a8d37fdc4a7c2f9d7ad04d/NEWS#L9-L14 https://gitlab.freedesktop.org/xorg/proto/xorgproto/-/merge_requests/70/diffs?commit_id=cb44799b72f611eb4c9d7cc185bc3b09e070be08 Pick-to: 6.2 5.15 Fixes: QTBUG-117950 Change-Id: I55861868f2bb29c553d68365fa9b9b6ed01c9aea Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> (cherry picked from commit 8af35d27e8f02bbb99aef4ac495ed406e50e3cca) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit f3fbd07f7a180b58db8025c5165e42b7ea3390c2)
* Fix hi-dpi mouse and tablet events on AndroidShawn Rutledge2023-10-111-6/+8
| | | | | | | | | | | | | | | | Windows are not always fullscreen: e.g. the widget gallery example main window isn't maximized, and a popup window may open anywhere on the screen. So we always needed to offset by the window position. But it's better to use QPlatformWindow::mapFromGlobal() since we are working with native coordinates here. Pick-to: 6.2 Fixes: QTBUG-109025 Change-Id: Id3d139fad610bbbc67a394599570a309196ae64c Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io> (cherry picked from commit 05de22e5f9edb107115029a126170034a78a5096) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 3369a7ab5fcae122ddc5db8e74e09631d2c5016d)
* Fix CTF with namespace buildAntti Määttä2023-10-111-2/+2
| | | | | | | | | | Include moc must be outside the namespace. Change-Id: Ibdd539b5fdd8ab4aeb0019bcbb62d5702c310065 Reviewed-by: Antti Määttä <antti.maatta@qt.io> (cherry picked from commit 0bbb2f6981d3109b1e1e20639b88c6a05e6798e3) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 1f7749ad31d790ed030e66f9827356c1684137ef)
* Deduplicate code in setup of serialization convertersEdward Welbourne2023-10-101-82/+49
| | | | | | | | | | | | | | | | | The setup of the input and output converters is fairly complex but was made harder to read by nearly-duplicating its logic for input and for output. Break out into a separate function to make clear what parts differ between the two and what parts don't. In the process, allow the search for a named converter to continue past a match that doesn't support the needed direction, on the off chance of a name collision. Make an error message more articulate in the process. Task-number: QTBUG-111228 Change-Id: I2a9de8b406c538098076f388fc8a1980b91fe16b Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> (cherry picked from commit 6a7b7272cd6ce6b8264796c25b686bf5376b8aea) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 8f43b0ee5baf2a29f984bce63ce8592042c00161)
* Check input and output converters do support the relevant directionsEdward Welbourne2023-10-101-4/+7
| | | | | | | | | | | | | | It was previously possible to select an input-only converter for output or an output-only converter for input. Also add a comment to explain why failure to probe for the auto output converter isn't an error, where failure to probe for the auto input converter is. Task-number: QTBUG-111228 Change-Id: I17dfbbee7d8b5a9629e66d0e1a6a4014b01a7262 Reviewed-by: Ievgenii Meshcheriakov <ievgenii.meshcheriakov@qt.io> (cherry picked from commit ccd59b2d4f8f1c4fde3f1498d28c0dc91ba75efd) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit b4e09800bbc0d9ba78d930a228a34c37dc4501c6)
* Fix documentation of QMetaClassInfoFriedemann Kleint2023-10-091-2/+5
| | | | | | | | | | | Mention the modules using it instead of claiming it is not used in Qt. Change-Id: I8c9490dfd89444509961c73eeff2f8584e0c5df4 Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit 1ffe7fbff0e0e5f40eedbd5dc9fb554c562a9338) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 5097f3fa332e6e78f29e9182cf176e551c9dc0d1)
* Fix disabled button color in Linux (X11/Wayland)Santhosh Kumar2023-10-091-0/+3
| | | | | | | | | | | | | | | | | | The palette mapping table (as read from gtk widget) maintained in QGtk3Storage misses information of QPalette::Button and QPalette::ButtonText role for QPalette::Disabled color group. This cause disabled button widget to be rendered with incorrect palette (such as in dark color scheme, light palette had been used). This patch fixes this issue by extending palette mapping in QGtk3Storage for disabled color group of button role. Fixes: QTBUG-113486 Change-Id: Ied4b2650c92cc1cda58be69257945991013b276f Reviewed-by: Axel Spoerl <axel.spoerl@qt.io> (cherry picked from commit 4cffb3b5fbbad24fed26690c3e10c0332cb0b33f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 3e971798e73d5414f65841f70de0ba5d5f71097f)
* Guard QWindowsContext::instance() during screen change on shutdownTor Arne Vestbø2023-10-091-1/+2
| | | | | | | | | | | | | | | Destructing the QWindowsScreenManager might result in a WM_DISPLAYCHANGE, at which point our QWindowsContext instance is likely gone. We need to guard against that. Fixes: QTBUG-117473 Change-Id: If32941c5c11231f7c27e9dde54f4315f18da1100 Reviewed-by: Wladimir Leuschner <wladimir.leuschner@qt.io> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> Reviewed-by: Timothée Keller <timothee.keller@qt.io> (cherry picked from commit 7d663d2e08fb71801f0f1f084a124e706722bf0f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit d599451e24b68c1555d965e3566bd9b74bf1b6a2)
* Revamp Local Fortune Server Example: Allow specifying the server nameRym Bouabid2023-10-093-21/+77
| | | | | | | | | | | | | | The server used to hardcode the name while the client allows the user to specify it. The server's UI is adjusted to let the user first specify the server name he wants to listen to and second stop listening to the current server. Task-number: QTBUG-117064 Change-Id: I80fc976151ead7a181fbc32080597277bc515313 Reviewed-by: Ivan Solovev <ivan.solovev@qt.io> (cherry picked from commit a8e8a77bc51fc87a5f3c4fec71070b5534659ad8) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit a0f1e229938220ad8103aa727ffde80a3a3c9e66)
* macOS: Silence warning about supporting secure state restorationTor Arne Vestbø2023-10-091-0/+17
| | | | | | | | | | | | | | | | | We don't support or implement state restorations via the AppKit state restoration APIs, but if we did, we would/should support secure state restoration. This is the default for apps linked against the macOS 14 SDK, but as we target versions below that as well we need to return YES here explicitly to silence a runtime warning. Pick-to: 6.2 Fixes: QTBUG-117745 Change-Id: I0145504a79e53499852832d23dc7d4d6838dfa1b Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> (cherry picked from commit fc1549c01445bb9c99d3ba6de8fa9da230614e72) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 546dae9285fe97defdab73437d6ae2bf19b806d8)
* xcb: set _KDE_NET_WM_DESKTOP_FILE and _GTK_APPLICATION_ID for windowLiang Qi2023-10-093-0/+30
| | | | | | | | | | | | | | in top level, which are in used very common for KDE and GNOME. Pick-to: 6.2 Fixes: QTBUG-117488 Change-Id: I88fe7b4afe44e4ac8f07e60e990cbe68498e98d9 Reviewed-by: Nicolas Fella <nicolas.fella@kdab.com> Reviewed-by: Ilya Fedin <fedin-ilja2010@ya.ru> Reviewed-by: Axel Spoerl <axel.spoerl@qt.io> (cherry picked from commit 70d3c15e8e9ef5965a242022e6681dd87dff5bd4) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 51129d65b931a0a5dd235f7df26a1fe9f421ad26)
* tst_QStringApiSymmetry: add more invalid UTF-8 sequencesMarc Mutz2023-10-081-0/+2
| | | | | | | | | | | These represent US-ASCII characters incorrectly encoded as a two-octet UTF-8 sequence. Change-Id: I5b1d58066d08cf61583dabcd71dd2f3ac7a3585a Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> (cherry picked from commit bc3ae300c5e6ab993549ce24ec681c4830741454) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 6818d6915d5aafd64bedd1e17209dcf6f3b93f40)
* cmake: remove xcb dependency for accessibility-atspi-bridge featureLiang Qi2023-10-081-1/+1
| | | | | | | | | | | | | Qt a11y(ATSPI) support only depends on DBus and ATSPI, it should also work fine on Wayland when xcb was disabled. Task-number: QTBUG-117535 Change-Id: Ibd7ebb32b94de1888920f0fe2b85ae3bd4d2c77a Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit 44894c579cb04b59057edd6f8bb5f77c62d701bf) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit fcb2ba3d984d2aac7861d99b06d86d8c1ed66060)
* a11y: add runtime checking for xcb only callsLiang Qi2023-10-081-5/+7
| | | | | | | | | | | This amends d23562da1c4cb525d4012bee55bd665c6cafef04 . Task-number: QTBUG-117535 Change-Id: I33f97f3c26409a33c8a069f9dcdfe61bbd88e2ec Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> (cherry picked from commit 7e14e6c2d3bb5297eefa273d5a23836c931c7517) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit efbcd597955d19abe838b4f9b544e41aed324214)
* a11y: fix the build without xcb headersLiang Qi2023-10-081-3/+11
| | | | | | | | | | | | | | | This amends 6802065da8706f1fc298a56b9f66ab8a815400d3 . Pure Wayland runtime and build envs without X11/xcb are more common. Need to find solution for ATSPI_MODIFIER_SHIFTLOCK on Wayland later. Task-number: QTBUG-117535 Change-Id: I65d41546e3dbb86c3a939a496ed43ac1737cf539 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> (cherry picked from commit 2ad3da8fce1bd31c3b4e970a505a051b7104765a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit b3cd75fde79adda9c58b9ac865ca8d5200d1cb94)
* Search extra library paths for Android dependency XML files as wellVolker Krause2023-10-071-0/+5
| | | | | | | | | | | | | | | | | This fixes a regression compared to Qt5. In Qt5 absoluteFilePath() unconditionally searched for all files in extra prefix dirs and the Qt install prefix, in particular also the -android-dependencies.xml files. After the changes in Qt6 up to now however those files are only searched in the Qt install prefix. This broke external libraries also making use of the -android-dependencies.xml mechanism, such as some KDE frameworks. Change-Id: Ic53aab50c70f853f3b1d621d6de6edb3df223905 Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> (cherry picked from commit d25438ebbd62cd10a435f6d7dd6a7ce181e3ac5f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 628f875b7a09efab95d1484fc2fec4bd2f31bb85)
* Windeployqt: fix typoTimothée Keller2023-10-071-1/+1
| | | | | | | | | | | | Change "qpaths" to "qtpaths" since the former is not a valid option. Fixes: QTBUG-117817 Change-Id: Ib8c8c80f31c1c54747340442c6bf3185c7c69001 Reviewed-by: Wladimir Leuschner <wladimir.leuschner@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit 84d0ebabaab38a900b74bb0f384f46f3c9a400d2) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit f4b91d595ce0ec69b01848bfe68d468c63d20d5a)
* QStringConverter: clarify decode()/encode() API docsAhmad Samir2023-10-073-24/+39
| | | | | | | | | | | | | These methods return a struct which is implicitly convertible to QString/QByteArray respectively. Don't hide the return type from QDoc, this simplifies telling users what those methods return exactly. Fixes: QTBUG-117705 Change-Id: Ibb22a1e54fffce8f5f20aaabe47983870ccfba1e Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> (cherry picked from commit 9e5df4ae5344374eaae0cbdaa526d4dd49ed3a13) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit bab635fea519447e9cadb2ed0039fb73ae3365d2)
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-08 23:20:48 +0000