summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* wasm: Dont access QNetworkReply header data through dangling pointerv6.6.36.6.3Piotr Wierciński2024-03-182-2/+2
| | | | | | | | | | | Fixes: QTBUG-122893 Change-Id: I3768fdffaec7be4ec0b559fdb365600220e648d1 Reviewed-by: Lorn Potter <[email protected]> (cherry picked from commit a5b00cefef12999e9a213943855abe6bc0ab5365) Reviewed-by: Qt Cherry-pick Bot <[email protected]> (cherry picked from commit 9a59f6bc574e3b9dfa09ac33e6dd951f105f87bb) Reviewed-by: Piotr Wierciński <[email protected]> (cherry picked from commit 8341bfd960a09576f95ebabb1e9ad767e85198b1)
* SQLite: Update SQLite to v3.45.2Christian Ehrlicher2024-03-173-85/+218
| | | | | | | | | | | [ChangeLog][Third-Party Code] Updated SQLite to v3.45.2 Change-Id: I3b841bc009f2e0ed6dcfa1b93cbb8bce0cd9ad47 Reviewed-by: Volker Hilsheimer <[email protected]> (cherry picked from commit 91f8d1de37aa3a74af83ed997c1686f10e2fed72) Reviewed-by: Qt Cherry-pick Bot <[email protected]> (cherry picked from commit 9478e25284ccd04208c384d026ee3740ddcd82fd) (cherry picked from commit 2fa41e1ea3e0afd2d251162d117d371c3ae46024)
* QStyleSheetStyle: don't draw check indicator twiceChristian Ehrlicher2024-03-101-3/+5
| | | | | | | | | | | | | | | | | When the styled check indicator is smaller than the one from the base style, then the clip region was to small and the check indicator from the base style was also drawn. Therefore add both check rects to the clipRegion. Pick-to: 6.5 Task-number: QTBUG-102820 Fixes: QTBUG-122821 Fixes: QTBUG-122825 Change-Id: I1b5b8d70d66475bbfa4a40652dc3fdd4cc670c32 Reviewed-by: Volker Hilsheimer <[email protected]> (cherry picked from commit 1ac58f4ba343d0de74cfc879a13a751bcb49c316) Reviewed-by: Qt Cherry-pick Bot <[email protected]> (cherry picked from commit da59bc3434551b8a84ac643de3c18604d88338c6)
* PNG: preserve ICC profiles that QColorSpace does not handleGiuseppe D'Angelo2024-03-101-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QColorSpace::isValid() returns true if QColorSpace can handle the profile. When called on a QColorSpace obtained via QColorSpace::fromIccProfile, this doesn't necessarily mean that the ICC profile itself was invalid; it could be that the ICC data was valid, but QColorSpace didn't know how to use it. This is especially true on Qt <= 6.7, where only XYZ/RGB matrix profiles were supported. We don't fully parse ICC v4, and we're lacking an API to differentiate between "ICC data was valid but QColorSpace doesn't handle it" vs "ICC data was invalid". Still, an invalid QColorSpace will still the original ICC data, so it can be saved again without loss of information. So: 1) when loading a PNG with embedded ICC data, keep the loaded profile even if it's "invalid"; 2) when writing a PNG, check if we have ICC data to save, and unconditionally write it if it's the case. This avoids data loss in the two directions. This work has been kindly sponsored by the QGIS project (https://qgis.org/). Pick-to: 6.5 Change-Id: I1f27f603acbca1590c820e80f52f3b994f5ea5c7 Reviewed-by: Allan Sandfeld Jensen <[email protected]> (cherry picked from commit 003cef9d40f2e840f2690bd465994deaab5c2b95) Reviewed-by: Qt Cherry-pick Bot <[email protected]> (cherry picked from commit 712eb47886b86c816ab3b75d152b3c93b57a0c0e)
* Windows QPA: Include custom margins in atypical marginsTimothée Keller2024-03-091-5/+6
| | | | | | | | | | | | | | | | When calculating atypical margins that are used with ExtendsContentIntoTitleBar, the margins were checked against systemmargins, and then custom margins were added later. Instead, add the custom margins immediately and take them into account during calculations. Pick-to: 6.5 Change-Id: I44af663c85b8bdf080d769e3b38431cbe5df64f3 Reviewed-by: David Faure <[email protected]> (cherry picked from commit 82e8f9e4571c50be476f8e38f9239c5b0c6be32c) Reviewed-by: Volker Hilsheimer <[email protected]> (cherry picked from commit acb5a72ef0f48c3b48ae81388580fd8a9a38fd77) Reviewed-by: Qt Cherry-pick Bot <[email protected]>
* Avoid QRubberBand leaving artefacts in QListViewEirik Aavitsland2024-03-091-2/+7
| | | | | | | | | | | | | | | On hidpi screens, the painted edges of the rubberband can extend beyond the selection rect because of scaling. Extend the area to be updated by 2x frame width, when the rubberband changes. Fixes: QTBUG-113432 Pick-to: 6.5 Change-Id: Ie7aec1fefdc3fbf71c63952b693f462697adf849 Reviewed-by: Volker Hilsheimer <[email protected]> Reviewed-by: Eirik Aavitsland <[email protected]> (cherry picked from commit a5a6b657a799cbed4567f60342714df52f9c8891) Reviewed-by: Qt Cherry-pick Bot <[email protected]> (cherry picked from commit bcc581761451b4464d5a81f83d8d2afb07ca9512)
* QObject: fix a documentation note in the destructorGiuseppe D'Angelo2024-03-081-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | The docs for ~QObject say: > any pending posted events for the object are removed from the event > queue but then they also say: > Deleting a QObject while pending events are waiting to be delivered > can cause a crash These two contradict each other. In fact, the first one is correct, the second one is factually incorrect. Amend it to what I believe it's the intended meaning: do not destroy a QObject which is _handling_ an event (i.e. we're into QObject::event() or an override). Change-Id: Id1d564f296e17a764e0f49ebfedf6e292085c221 Pick-to: 6.5 6.2 Reviewed-by: Thiago Macieira <[email protected]> Reviewed-by: Shantanu Tushar <[email protected]> Reviewed-by: Fabian Kosmale <[email protected]> (cherry picked from commit 6e0c438a41a61a3d0a93954f00f46951c4399224) Reviewed-by: Qt Cherry-pick Bot <[email protected]> (cherry picked from commit 23d7faa8a1f69a97d8e094be7e81f907361b02ae)
* Correct documentation of QDateTime's comparisonsEdward Welbourne2024-03-081-11/+18
| | | | | | | | | | | | | | | | | | | | These previously claimed that date-times with different date, time or zone are different; as pointed out by Marcus Tillmanns, this is not true. Corrected the documentation to talk about representing the same moment in time. In the process, renamed the snippet shared with several other docs, since the snippet name only focused on the other part of what it was saying. Pick-to: 6.5 6.2 5.15 Fixes: QTBUG-122973 Change-Id: Ifd74da84aad0b0dca688c131b6ae6a7b65633225 Reviewed-by: Giuseppe D'Angelo <[email protected]> Reviewed-by: Thiago Macieira <[email protected]> (cherry picked from commit cb5aac06cf7b3982a42004fd7455d78a3caba550) Reviewed-by: Qt Cherry-pick Bot <[email protected]> (cherry picked from commit b93e7619a421f072c2a73cbae47f98e4fdccc20c)
* Fix menu size in multiscreen setupsFriedemann Kleint2024-03-083-4/+25
| | | | | | | | | | | | | | | | | | | | | During QMenuPrivate::popup() and QMenuBarPrivate::popupAction(), QMenuPrivate::popupGeometry() is called from updateActionRects() with screen = 0 several times (from sizeHint() and various event handlers triggered), which causes it to return the primary screen geometry always. To fix this for the non-QGraphicsView case, use the screen of the menu when it is visible or the screen stored in a newly introduced popupScreen member variable, which is set from a few places in QMenuPrivate::popup(). Fixes: QTBUG-118434 Pick-to: 6.5 Change-Id: I6b18593d313719d628b0856004197ac59f46c270 Reviewed-by: Volker Hilsheimer <[email protected]> (cherry picked from commit 8cd7a3d4723ca414f3fe544704a0ccb752da94b8) Reviewed-by: Qt Cherry-pick Bot <[email protected]> (cherry picked from commit 60d91acc0ab6a2ffde42617923fa81dc7fd3ffee)
* wasm: send DPR change event on window updateMorten Sørvig2024-03-081-1/+6
| | | | | | | | | | | | | | | | | | | Qt Gui expects that the platform sends DPR update notifications if the DPR value has changed, before sending expose/paint events or delivering update request events. The most straightforward implementation is to send the DPR update event unconditionally and let Qt Gui determine if the DPR value has changed, especially if the native platform does not provide DPR change events. Change-Id: Ica7a24a458b3b01f1c7b2e1e09d342114dc71331 Reviewed-by: Morten Johan Sørvig <[email protected]> (cherry picked from commit b8584173ab6a3fc4e034bc237b34f4968528b0f3) Reviewed-by: Qt Cherry-pick Bot <[email protected]> (cherry picked from commit 4f8d01b43669a82533a93df44fcd76b10e01f955)
* XCB: Unset the connection's mousePressWindow if it's this windowAndy Shaw2024-03-081-0/+2
| | | | | | | | | | | | In some rare cases it can delete the window before this is handled by other calls, so rather than crashing we clean up. Pick-to: 6.5 6.2 5.15 Change-Id: Iddcd9890f0c13f4130626b0ed9c5b32f5890208d Reviewed-by: Axel Spoerl <[email protected]> (cherry picked from commit b8f9a8681347476f4db1719b38a67d7f9d3c74be) Reviewed-by: Qt Cherry-pick Bot <[email protected]> (cherry picked from commit be78514b206aff3152a239c188fcc4e7aba5439a)
* QGlobalStatic: suppress -Wtsan warningGiuseppe D'Angelo2024-03-081-0/+8
| | | | | | | | | | | | | | | | | | QGS employs a call to std::atomic_thread_fence. Unfortunately TSAN does not support it, and GCC >= 11 raises a warning. This breaks the build when building under -Werror. Suppress the warning using the usual pragmas. There's a catch: qglobalstatic.h is built into a PCH, and GCC <= 13 will still generate a warning because of https://gcc.gnu.org/bugzilla/show_bug.cgi?id=53431 . Change-Id: I770f39b7563b66f483851444cd580bcafc5f288a Pick-to: 6.5 Reviewed-by: Thiago Macieira <[email protected]> (cherry picked from commit 143bcbb96f512d8e4014f0abba99f8e7a8729499) Reviewed-by: Qt Cherry-pick Bot <[email protected]> (cherry picked from commit 21c3f17eaa9aa4ad56c8f74e3f67c52420a3fbc7)
* Revert "QAndroidPlatformInputContext: send composition text and cursor jointly"Axel Spoerl2024-03-071-7/+15
| | | | | | | | | | | | | | This reverts commit be3b9b2ab12f664c196d649e8c4247d70805d667. Reason for revert: Caused QTBUG-121561 Fixes: QTBUG-121561 Pick-to: 6.5 6.2 Change-Id: I4b59d97ede6c50d2575a7d7cebbe2291983dd19f Reviewed-by: Tor Arne Vestbø <[email protected]> (cherry picked from commit 46502f9705634f02626ee1057975463d1c0ae1f8) Reviewed-by: Qt Cherry-pick Bot <[email protected]> (cherry picked from commit c76dd919fd89a9cf4fcbbf162423d12f3b5d6090)
* Update bundled libpng to version 1.6.43Eirik Aavitsland2024-03-0712-108/+133
| | | | | | | | | | | | | [ChangeLog][Third-Party Code] libpng was updated to version 1.6.43 Pick-to: 6.5 6.2 5.15 Fixes: QTBUG-122989 Change-Id: Id439e64010bc3f6752f5589d663827a91f009173 Reviewed-by: Qt CI Bot <[email protected]> Reviewed-by: Eskil Abrahamsen Blomfeldt <[email protected]> (cherry picked from commit 210f2004dffae149c857d8d79d51eb996643ad4a) Reviewed-by: Qt Cherry-pick Bot <[email protected]> (cherry picked from commit e1f069e65de96906438f5bec75708bec93d2bee5)
* Map drag event positions to global during dock/toolbar dragDavid Redondo2024-03-061-1/+2
| | | | | | | | | | | | | Drag event positions are window relatives, QMainWindowLayout::hover expects global coordinates however. Fixes: QTBUG-122949 Change-Id: I28469ba1b5ef88661e744d4cf87f6acab3eb2c72 Reviewed-by: David Edmundson <[email protected]> Reviewed-by: Axel Spoerl <[email protected]> (cherry picked from commit 986de654b8c3af57af6f76581e50ff9e54c98b20) Reviewed-by: Qt Cherry-pick Bot <[email protected]> (cherry picked from commit 2bc6b25c5655e17f65a3a7fd84ba38f203f5cf4a)
* Handle drag leave when performing platform drag of docks or toolbarsDavid Redondo2024-03-061-0/+5
| | | | | | | | | | | | | | | The existing widget machinery works through mouse positions. In order to correctly update state when a drag moves outside of a window it needs to see a move outside of the window. When the platform drag leaves the window a move to the outside of the window is now faked to not keep the layout in the hovered state of the last move event. Fixes: QTBUG-122944 Change-Id: I348f5281a200b78e6be4f11b3c25339d052783a5 Reviewed-by: Axel Spoerl <[email protected]> (cherry picked from commit d7fe948fdb79e919065875410dba14275a2a7478) Reviewed-by: Qt Cherry-pick Bot <[email protected]> (cherry picked from commit 157f7b47e460a388baa6f162383462febb2a0877)
* drm: Fix having more than window over the screen's lifetimeLaszlo Agocs2024-03-062-1/+9
| | | | | | | | | | | | | | | | | | | ...when not using atomic. On the non-atmic path the fb is passed in to drmModeSetCrtc. Here we need a new call to it if a new QWindow gets created after the previous one is destroyed. Previously this was not done, so it ended up with Device busy errors. Atomic does not need this since there the flip commit always contains framebufferPropertyId. Change-Id: Ie68152cad50438807ef45adfba65e74c8f30c956 Fixes: QTBUG-122663 Pick-to: 6.5 Reviewed-by: Andy Nichols <[email protected]> (cherry picked from commit 818f8de64a2b1a7371ecb4bdd527b05343190582) Reviewed-by: Qt Cherry-pick Bot <[email protected]> (cherry picked from commit bdf324871a7f1d924cf23e7311390db64aa6b99d)
* drm: atomic: Avoid device busy when flipping after creating a new windowLaszlo Agocs2024-03-061-2/+6
| | | | | | | | | | Task-number: QTBUG-122663 Change-Id: I168930428e8d09a9a042401460d678e20f3b82d5 Pick-to: 6.5 Reviewed-by: Andy Nichols <[email protected]> (cherry picked from commit 0a3b5042a566afa4dc5162f469eb0d8be3120933) Reviewed-by: Qt Cherry-pick Bot <[email protected]> (cherry picked from commit e3b2386dd7d3078b398c76a2715e3ff318223982)
* QtXml: fix leak in QDomText::splitTextChristian Ehrlicher2024-03-052-0/+7
| | | | | | | | | | | | | QDomText::splitText() needs to unref() the newly created QDomText instance as it does not use it by itself Pick-to: 6.5 6.2 5.15 Fixes: QTBUG-40561 Change-Id: I593011b63c39f2310204d97ec61da7cf78a0fc14 Reviewed-by: Giuseppe D'Angelo <[email protected]> (cherry picked from commit de0230467c1f658232b101a99e62d68992173592) Reviewed-by: Qt Cherry-pick Bot <[email protected]> (cherry picked from commit 975fc3da70ee83410876a205a2ebfbf25dd27e30)
* Revert "synqt.cpp: scan for and reject #pragma once"Robert Griebl2024-03-051-15/+3
| | | | | | | | | | | | | This breaks qtapplicationmanager, which uses #pragma once exclusively. That repo is fixed for 6.7/dev, but backporting that huge patch to 6.6 (dead) and 6.5 (LTS) is not very practical and also odd to have that late in the LTS release cycle. This reverts commit 656fb759115467de31b771b0138411e73d2b643a. Pick-to: 6.5 Change-Id: I04576453a1b06878d2afa2ef1e6dda038ce864ad Reviewed-by: Volker Hilsheimer <[email protected]>
* UDP: don't disable read notification unless we have a datagramMårten Nordheim2024-03-053-2/+9
| | | | | | | | | | | | | | | | | | | The current logic that we will disable the read notification if we have any data at all doesn't make sense for users who use the receiveDatagram functionality, since they will not make any calls that trigger the read notifier to be re-enabled unless there is a datagram ready for us to hand back. Changes in this cherry-pick: - Changed 10s chrono literal to 10'000 Fixes: QTBUG-105871 Pick-to: 6.5 Change-Id: I0a1f1f8babb037d923d1124c2603b1cb466cfe18 Reviewed-by: Thiago Macieira <[email protected]> (cherry picked from commit b2ff0c2dc25f640a31fa170dd7cd8964bbcd51d6) Reviewed-by: Qt Cherry-pick Bot <[email protected]> (cherry picked from commit 65406e0be7d5d2b687e3e07930ad60bcae893471)
* Remove QWindowPrivate::compositingTor Arne Vestbø2024-03-052-3/+0
| | | | | | | | | | | | | | It was added for Android in a4f50269f82695fbd0dd344f87b4b355feff4333, for the case of QSurface::RasterGLSurface, but since 6.4 we no longer use QSurface::RasterGLSurface for composition. And the Android usage was removed in 2020ce5fd2478389c56f34742fdeee9cd24ca8a5. Pick-to: 6.5 Change-Id: I8dafe959c54e09b3a974253e15d184365141d559 Reviewed-by: Axel Spoerl <[email protected]> (cherry picked from commit f517e85e906bcfb59dd11d1fb4a1bea84afb1d9a) Reviewed-by: Qt Cherry-pick Bot <[email protected]> (cherry picked from commit f9f9c648b45014f3277b79ec4098eb3d24937b80)
* Android: Remove uses of QWindowPrivate::compositingTor Arne Vestbø2024-03-052-9/+4
| | | | | | | | | | It was added for Android in a4f50269f82695fbd0dd344f87b4b355feff4333, for the case of QSurface::RasterGLSurface, but since 6.4 we no longer use QSurface::RasterGLSurface for composition. Pick-to: 6.5 Change-Id: Ib12d1a39cf853e4f97f369cf0f76fd1dfd5c7bad Reviewed-by: Assam Boudjelthia <[email protected]>
* Add QWidgetPrivate::rhi() helper methodTor Arne Vestbø2024-03-043-9/+14
| | | | | | | | | | | | For accessing the RHI managed by the widget compositing machinery. Pick-to: 6.5 Change-Id: Ia3c1227cc2d9cfebe95611cad3dbcd7aa6f6f8c7 Reviewed-by: Axel Spoerl <[email protected]> (cherry picked from commit f451b01791536fede40c8d4fb90799c2e23e9386) Reviewed-by: Qt Cherry-pick Bot <[email protected]> (cherry picked from commit 9dbb295279f958e4ddd480bf9312b77643c80c0e) Reviewed-by: Tor Arne Vestbø <[email protected]>
* QDockWidget: Use resizer without native window decorationAxel Spoerl2024-03-041-4/+4
| | | | | | | | | | | | | | | | | 975c0bdf732ea7c5f7632913a27a1b6ae5cd5b26 has disabled usage of a resizer on Windows. This has caused a regression, when a dock widget was rendered frameless. Use a resizer in that case. Fixes: QTBUG-120694 Task-number: QTBUG-102196 Pick-to: 6.5 6.2 Change-Id: I9fbcb1a8b1d8869995093bc1da7524ec81e9f02d Reviewed-by: Oliver Wolff <[email protected]> (cherry picked from commit 89fc58127d449cc2995879ff334567141e9c1d58) Reviewed-by: Qt Cherry-pick Bot <[email protected]> (cherry picked from commit 80532288174dc5bd4b23bd13ae53faeafad8ceeb)
* QDBusUtil: document the D-Bus signature grammarMarc Mutz2024-03-041-0/+15
| | | | | | | | | | | | | | | | | The specification doesn't provide an explicit grammar, so I turned the prose into ABNF for easier reference. The goal is both to aid review of the validateSingleType() function and to eventually use this to write a parser that doesn't use, or at least limits, recursion. Pick-to: 6.5 6.2 5.15 Change-Id: I21f81aa83cde356ab48105ea98f066024e0b7b5e Reviewed-by: Juha Vuolle <[email protected]> Reviewed-by: Thiago Macieira <[email protected]> (cherry picked from commit 476d2a7392ee26294d1230f0c5031fe6bb4a0f26) Reviewed-by: Qt Cherry-pick Bot <[email protected]> (cherry picked from commit c49366a54387eae2467db7efd288fd51d8114857)
* [docs] QDBusUtil::isValidObjectPath(): simplify descriptionMarc Mutz2024-03-041-3/+2
| | | | | | | | | | | | | | The "does not contain two slashes in sequence" condition reads a bit unmotivated. It's easier written as "each part is not empty", so do that. Pick-to: 6.5 Change-Id: Ibb204429521910582bd8ee03ff54f72d7e15ce84 Reviewed-by: Thiago Macieira <[email protected]> Reviewed-by: Leena Miettinen <[email protected]> (cherry picked from commit 63b52ba994ca9d9a0ceaeab465f64465b1fa137a) Reviewed-by: Qt Cherry-pick Bot <[email protected]> (cherry picked from commit b1b97173045b12ac2434897e63b8060197661891)
* QProcess/Doc: remove the note that about FailedToStart after started()Thiago Macieira2024-03-041-3/+0
| | | | | | | | | | | | | | | | | | | | It was added in commit 75a2c81b0041df4ca59178cf52d9e5a8815f3524: Handle posix_spawn using exit code 127 to indicate fail-to-start Most posix_spawn implementations are done using fork(), so the only way to report errors afer fork() is via a special exit code. Support for posix_spawn was removed when we dropped QNX 6.5 support in Qt 5.7 (commit 005a8bfbf0022f03dafafcf2b5c438ccf0675a49). Also complements commit d012e953bfb498091c0ea9a83a717a3deffc670f. Change-Id: I76ffba14ece04f24b43efffd17aadead7c30146b Reviewed-by: Oswald Buddenhagen <[email protected]> Reviewed-by: Ahmad Samir <[email protected]> (cherry picked from commit 75254e1d355b2eb33fece8bc1a468ce92ac65c7e) Reviewed-by: Qt Cherry-pick Bot <[email protected]> (cherry picked from commit 9539f527fcda6ca9b8df09e63fd93f0206649a41)
* Fix previewing a preview on reentranceAllan Sandfeld Jensen2024-03-033-0/+9
| | | | | | | | | | | | | Make the print preview more tolerant of reentrance by avoiding previewing itself. Change-Id: Ia4774cb51bdda7d311414c4e2f9c2bfbed4f187f Pick-to: 6.5 Fixes: QTBUG-122749 Reviewed-by: Friedemann Kleint <[email protected]> (cherry picked from commit 367e6ff0b20be47fdc9ddd72866053ec60cbe254) Reviewed-by: Qt Cherry-pick Bot <[email protected]> (cherry picked from commit 3ff5f601b6224fd7768d049843c415e502ab3558)
* Add QWidgetPrivate::closestParentWidgetWithWindowHandle helper methodTor Arne Vestbø2024-03-032-0/+20
| | | | | | | | | | | | In contrast to nativeParentWidget(), we return the closest widget with a QWindow, even if this window has not been created yet. Pick-to: 6.5 Change-Id: Icac46297a6052a7a5698d752d4aa871bd5c2bdd8 Reviewed-by: Axel Spoerl <[email protected]> (cherry picked from commit b571634172428263fa83ac733cf89e664bded014) Reviewed-by: Qt Cherry-pick Bot <[email protected]> (cherry picked from commit 0c519efa110ea298167e58774e220894a856fb78)
* windows: Remove workaround for delayed OpenGL initializationTor Arne Vestbø2024-03-033-24/+0
| | | | | | | | | | | | | We no longer use QSurface::RasterGLSurface for composition, so the window will already be QSurface::OpenGLSurface during WindowCreationData::initialize. Pick-to: 6.5 Change-Id: I9b5ea0245ddf4a19d165bde9ad6fd48a98bfca4f Reviewed-by: Laszlo Agocs <[email protected]> Reviewed-by: Oliver Wolff <[email protected]> (cherry picked from commit dc5a29b3246d19bd620acc9fdaea929bf856d8dc) Reviewed-by: Qt Cherry-pick Bot <[email protected]> (cherry picked from commit b3aa8fca210c9a2a1c228c48525ded2c23401a4e)
* Fix spelling of FFmpeg in (end-)user-visible string of windeployqtVolker Hilsheimer2024-03-021-2/+2
| | | | | | | | | | | | It's two capital "FF", lowercase "mpeg". Pick-to: 6.5 Change-Id: I4eca719fa6ce0133e3ddb6163c81e24493b378e3 Reviewed-by: Kai Köhne <[email protected]> Reviewed-by: Artem Dyomin <[email protected]> (cherry picked from commit 7bde3f4c4c6b4c27ce4ce45b6735d61f405ea53b) Reviewed-by: Qt Cherry-pick Bot <[email protected]> (cherry picked from commit 67c5cbb8e18359d8c6260d1043ca970d3ddc4f92)
* androiddeployqt: fix QDirIterator::next() usageAhmad Samir2024-03-021-2/+3
| | | | | | | | | | | | | | The code inside the loop body uses it.next() twice, however hasNext() is called only once; each call to next() advances the iterator. Amends 4041610cb202699a47268975e5aaecaa1f182c0a. Pick-to: 6.5 6.2 5.15 Change-Id: Idb96cfbddc56e0d7ed38ab1b0279f40592c75175 Reviewed-by: Assam Boudjelthia <[email protected]> (cherry picked from commit 56e151663ebfd4fc0876d33f22c81f0218339914) Reviewed-by: Qt Cherry-pick Bot <[email protected]> (cherry picked from commit 6a74a3c4c6bf0af2297a32ec659fc2311f7e5126)
* QTextHtmlImporter: don't forget to appendBlock after block tag closedShawn Rutledge2024-03-022-1/+5
| | | | | | | | | | | | | | | | | If we see a closing tag that really demands a new block after it, like </ul>, that needs to be done even if some ignorable whitespace and "inline" tags come after it. Don't get distracted by those. Also add a comment in QTextDocument::setHtml() to remind the reader that HTML parsing is a two-pass algorithm. Fixes: QTBUG-81662 Change-Id: If723c9d3c211a684725055a06bcf87be4e38923a Reviewed-by: Qt CI Bot <[email protected]> Reviewed-by: Eskil Abrahamsen Blomfeldt <[email protected]> (cherry picked from commit 60aeeb0e92762d57c208e4212374d30be6490611) Reviewed-by: Qt Cherry-pick Bot <[email protected]> (cherry picked from commit f0713117d6d0b77c5903ffe9ce3a7d5317021691)
* Refactor and fix QMainWindow::tabifiedDockWidgets()Axel Spoerl2024-03-013-28/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The method traversed QDockAreaLayoutInfo::item_list, to identify dock widgets tabbed with the QDockWidget argument in a tab bar It relied on bool QDockAreLayoutInfo::tabbed, which is set to true, when a QMainWindowTabBar is to be added to a QDockAreaLayoutInfo. This flag isn't cleared, when the second last dock widget is removed from the tab bar. It can't be replaced by QMainWindowLayout::isDockWidgetTabbed, because the flag also represents intermediate states, where e.g. a dock widget is hovered over, prepares to become a floating tab and then rolls back, because hovering doesn't result in a drop. In that case, tabbed must become true, which the dock widget isn't actually tabbed. Furthermore, the way to traverse item_list didn't find dock widgets in a floating tab. In that case, tabifiedDockWidgets() wrongly returned an empty list. To fix both issues, refactor QMainWindow::tabifiedDockWidgets() to read the list of dock widgets directly from the QMainWindowTabBar. Add tests in tst_QDockWidget::floatingTabs() and updateTabBarOnVisibilityChanged() Fixes: QTBUG-122001 Pick-to: 6.5 Change-Id: Ia9eb3711be642101261f34ee447521cc6accc20c Reviewed-by: Volker Hilsheimer <[email protected]> (cherry picked from commit cd2a3e970aaeb8f5f92d9c6e52ede7a82f953150) Reviewed-by: Qt Cherry-pick Bot <[email protected]> (cherry picked from commit 5e89966da1a2107324171a222f27e7c02340a449)
* QIcuTimeZonePrivate constructor: save iteration over all zone IDsNicolas Fella2024-03-013-15/+26
| | | | | | | | | | | | | | | | | | | | | | | | ICU returns a "valid" representation of GMT when given an unrecognised ID, so QTZ's constructor has been checking the ID is available before passing it to the backend constructor. That availability check was done by generating the list of available IDs to see if the given ID was in it; this is very inefficient. Furthermore, the QTZ constructor was also checking availability, to work round the same issue in only this one backend, making the check redundant. So overide isTimeZoneIdAvailable() in the ICU backend, calling ucal_getCanonicalTimeZoneID(), which answers the question directly; and drop the duplicate check in the QTZ constructor. Expand a test to verify an invalid name is rejected. Fixes: QTBUG-121807 Pick-to: 6.5 Change-Id: I34f996b607b958d12607a94eb273bb1b406cca1a Reviewed-by: Thiago Macieira <[email protected]> (cherry picked from commit 00d9a9a9b59650b8e297f91dcc600c377da5bceb) Reviewed-by: Volker Hilsheimer <[email protected]> (cherry picked from commit 74c59f8a2350ed9ca640c42b641fd02d4e7c6dbd) Reviewed-by: Qt Cherry-pick Bot <[email protected]>
* Implement Qt::ImEnabled by isEnabled() and isReadOnly()Yansheng Zhu2024-03-013-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, querying Qt::ImEnabled only returned the value of isEnabling(), which is incorrect for edit widgets with read-only properties set, as Qt::ImEnabled indicates whether text can be *input* through the input method, which results in the IM being able to insert text into read-only edit widgets. The fixed version uses both isEnabling() and isReadOnly() values to determine whether input methods need to be enabled. For some platforms (like iOS and Android) that rely on IM to select text, a check for ImReadOnly has been added to their QPA plugins to enable handles on read-only input boxes. At the same time, the imEnabledNotImplemented function in the test file tst_qwidget was modified, since ImEnabling should give a _false_ value when a lineedit is read-only. Task-number: QTBUG-105009 Task-number: QTBUG-110838 Task-number: QTBUG-119182 Pick-to: 6.5 Change-Id: Ia2abcdb3200826d567f90447d4f8b71d0ef1fbf0 Reviewed-by: Yansheng Zhu <[email protected]> Reviewed-by: Richard Moe Gustavsen <[email protected]> (cherry picked from commit 70096b2bbd54d35518167cb41ea3576b992c3cda) Reviewed-by: Qt Cherry-pick Bot <[email protected]> (cherry picked from commit 24f6eaa111e2a51ffd32f09d0a76b20acc659643)
* Disable depfile support for the external projects when building for AndroidAlexey Edelev2024-02-291-1/+1
| | | | | | | | | | | | | | | androiddeployqt rules that support depfiles cause creation of rules that interfere each other and cause the test build flakiness in CI. This disables depfile support for ABI-specific external project until the rootcase is found. Task-number: QTBUG-122838 Pick-to: 6.5 Change-Id: I12e85f43494331c943c9b516d9494593facf9180 Reviewed-by: Assam Boudjelthia <[email protected]> (cherry picked from commit 356b0aee0e93c9fc51e79faa8d6904bf4d5a6c27) Reviewed-by: Qt Cherry-pick Bot <[email protected]> (cherry picked from commit 58b9d558ddd72656b2e7204e7021758efd169c91)
* QAbstractItemView: Release tab focus when hiddenViktor Arvidsson2024-02-291-1/+1
| | | | | | | | | | | | | | | | | When hiding a widget that has focus we try to focus the next widget in the focus chain by running focusNextPrevChild. The abstract item view overrides this to step the items but does not account for this hide case which makes focusing not only not work, but also by hiding the widget the selection in the item view gets changed. Pick-to: 6.5 Change-Id: I29d40a1fb86ced60ec742b2753a87383846a89b3 Reviewed-by: Viktor Arvidsson <[email protected]> Reviewed-by: Santhosh Kumar <[email protected]> Reviewed-by: Volker Hilsheimer <[email protected]> (cherry picked from commit d9397479e6dfc2d7b73cab6dcbcda4cccdc20b8a) Reviewed-by: Qt Cherry-pick Bot <[email protected]> (cherry picked from commit 92e1bf8e3b42ff24f86210a4e29ea790bff9fabf)
* synqt.cpp: scan for and reject #pragma onceMarc Mutz2024-02-291-3/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | In 2022¹, we gave ourselves the rule to allow #pragma once only in non-installed headers (examples, tools, snippets, ...), because the same installed header may reside in different places in the filesystem and #pragma once would treat these as separate headers, causing multiple-definition errors. Recently, the question came up: "What constitutes a public header?" Non-_p.h headers in e.g. src/plugins/ muddy the waters here a bit. Since #pragma once is forbidden in installed headers, I had the idea to use it to indicate non-installed headers. This patch enables use of #pragma once as a static assertion to that effect, should we so choose. ¹ https://lists.qt-project.org/pipermail/development/2022-October/043121.html Pick-to: 6.5 Fixes: QTBUG-122813 Change-Id: I3b5beef72e154cf5bf1ccd4b6f02df9680609e43 Reviewed-by: Volker Hilsheimer <[email protected]> Reviewed-by: Ivan Solovev <[email protected]> Reviewed-by: Alexey Edelev <[email protected]> (cherry picked from commit 1c8884fc277c5916a420a3c14de68547a391f9fc) Reviewed-by: Qt Cherry-pick Bot <[email protected]> (cherry picked from commit 12bf8fd6185ed0a44342c868e75c014d64a7544d)
* QWidgetRepaintManager: Use textureChildSeen to determine deferred updateTor Arne Vestbø2024-02-291-3/+3
| | | | | | | | | | | | | | | We want to get rid of the QWindowPrivate::compositing member, as it is no longer needed for the Android backingstore, which it was first added for in a4f50269f82695fbd0dd344f87b4b355feff4333. We can use textureChildSeen instead to check if we're compositing. Change-Id: If85b21f92c8253bf89543a7e81e03730023f8095 Reviewed-by: Axel Spoerl <[email protected]> (cherry picked from commit d31cc6dc7b1d1762990fdb70702981f73d060903) Reviewed-by: Qt Cherry-pick Bot <[email protected]> (cherry picked from commit ce054a1240a0288a9431e1b9b77c84597935139d) Reviewed-by: Tor Arne Vestbø <[email protected]>
* Prevent re-replacing state in setGeometryTomi Korpipää2024-02-291-1/+3
| | | | | | | | | | | | | Do not allow replacing a state again if it is already being replaced. Cleaned up from the patch provided in QTBUG-121126. Fixes: QTBUG-121126 Change-Id: Icca932b0e5cccd2f39ac18f29d8f7707887d147f Reviewed-by: Richard Moe Gustavsen <[email protected]> (cherry picked from commit f429f12a7fb94ef5970a28eaf0b53aea935044b3) Reviewed-by: Qt Cherry-pick Bot <[email protected]> (cherry picked from commit 2c743bc0cb96aa58aa88af8c14cff1b78692e606)
* Fix the qtpath issue with lto enabledAlexey Edelev2024-02-293-6/+13
| | | | | | | | | | | | | | | Move qtconfManualPath pointer to the unnamed namespace, so it's never exported. Add the static setQtconfManualPath method that sets the pointer at runtime. Fixes: QTBUG-122739 Pick-to: 6.5 Change-Id: Icfc631f9680ad5f484920b0fdf3e408b7657c108 Reviewed-by: Joerg Bornemann <[email protected]> Reviewed-by: Thiago Macieira <[email protected]> (cherry picked from commit bdb2f20154c1fa1f0962a46a22afdee453a2db1e) Reviewed-by: Qt Cherry-pick Bot <[email protected]> (cherry picked from commit a405320544a190fac3aaa0bfe8e842e4019e5386)
* Also check available in TZ timezone's constructorEdward Welbourne2024-02-291-0/+2
| | | | | | | | | | | | | | | | | | Follow up to commit 00d9a9a9b59650b8e297f91dcc600c377da5bceb - as commented in the QTZ constructor, one of the reasons for the prior "is available" check was to avoid creating TZ cache entries for it; so have the TZ backend also (like ICU) overtly check for availability before trying to find data for the given ID. This duplicates work done later in the constructor, which can perhaps be optimised out later, but is no worse than where we were before the commit mentioned above. Pick-to: 6.5 Task-number: QTBUG-121807 Change-Id: Ie0571df2de2bf0a3f4ee767184e58b378e8cb05a Reviewed-by: Thiago Macieira <[email protected]> (cherry picked from commit ec9ca7ac43cfebc74afc03de338f81a879354b2a) Reviewed-by: Qt Cherry-pick Bot <[email protected]> (cherry picked from commit a3a2d3df20a61836c41b9f115b2a8244d4381519)
* rhi: d3d: Print more details on swapchain creation failureLaszlo Agocs2024-02-292-4/+15
| | | | | | | | | | | | Do it both for d3d11 and 12. Also add a bail out when presenting to the latter (it is already there for d3d11). Task-number: QTBUG-109708 Change-Id: I6f8039bcf27fa20e4bebcdf01ac3feaa14249b4d Reviewed-by: Andy Nichols <[email protected]> (cherry picked from commit c738a349d2d6fa27e994657ce38fe9027c96a251) Reviewed-by: Qt Cherry-pick Bot <[email protected]> (cherry picked from commit 965c237aa229271e13e72aafd60c8293179b0c20)
* QDialogButtonBox: fix crash when adding a QToolButtonDavid Faure2024-02-291-1/+1
| | | | | | | | | | | Introduced by commit d4f38a363251fcb5cdfb24d7a1aceb7b630f7e8f Pick-to: 6.5 Change-Id: I99385249a454c75eeae13c1d17670b356427cb70 Reviewed-by: Axel Spoerl <[email protected]> (cherry picked from commit d9b63c90bf65d853fa74a1327ef7455e1b655fac) Reviewed-by: Qt Cherry-pick Bot <[email protected]> (cherry picked from commit 4c3d906068caafb9ce7170f51f93f0e429469397)
* syncqt.cpp: Extract Lambda error()Marc Mutz2024-02-291-3/+6
| | | | | | | | | | | It will be re-used in a subsequent patch. Pick-to: 6.5 Change-Id: Ia58020a39440d5e583450f7adecf561f7267c403 Reviewed-by: Alexey Edelev <[email protected]> (cherry picked from commit 74cbb1bbae718fce10b6ef1c882d74ffa4a2180d) Reviewed-by: Qt Cherry-pick Bot <[email protected]> (cherry picked from commit b0d04b227337bf2587bf35bcf376d51b877a8714)
* QPixmap: fix the documenation for toHICONGiuseppe D'Angelo2024-02-291-2/+3
| | | | | | | | | | | The functions are now on QImage, not on QtWIn. Change-Id: Ida777c7fc087bf673c5305beffb498ada115ed73 Pick-to: 6.5 6.2 Reviewed-by: Friedemann Kleint <[email protected]> (cherry picked from commit b2c95e74a6ad97bdebd9d1fed8ffec065aba31f0) Reviewed-by: Qt Cherry-pick Bot <[email protected]> (cherry picked from commit 40425a35caf8e235a21528b3f5f164226e049f5d)
* SQL/ODBC: Don't assert when no error record is availableChristian Ehrlicher2024-02-291-0/+2
| | | | | | | | | | | | | | | | When SQLGetDiagRec() does not return an record, the list of DiagRecords might be empty. This will create an assertion when trying to access QList::front() or similar. Therefore we need to check if the list is empty before accessing it. This amends 4ec5c0efc756a39162b43367438fee965c229ae7 Fixes: QTBUG-122073 Change-Id: I6f421d82f9b6fdf84672d755cbbe8d2adec13266 Reviewed-by: Volker Hilsheimer <[email protected]> (cherry picked from commit 6287daaa20bfb306d1e2d87d67df961e1da2857a) Reviewed-by: Qt Cherry-pick Bot <[email protected]> (cherry picked from commit 8b100d89f3e76fd2ac9e15424472449cb2483c68)
* Windows: clean up System Tray Icon message iconVolker Hilsheimer2024-02-292-1/+10
| | | | | | | | | | | | | | | | | The handle is not owned by the Shell, we have to clear it up ourselves. The documentation is not clear about how long the handle needs to be kept alive, so store the icon when we create it as a member of the private, and clean it up when it need to be recreated, or when the QSystemTrayIcon instance gets destroyed. Fixes: QTBUG-96348 Fixes: QTBUG-62945 Pick-to: 6.5 6.2 5.15 Change-Id: I6f93f29a415cde2cfe4e1b296295783c15b4da4b Reviewed-by: Oliver Wolff <[email protected]> (cherry picked from commit afb74a86d8cd1ac6463fa804300480967101d7d7) Reviewed-by: Qt Cherry-pick Bot <[email protected]> (cherry picked from commit 59ff87dc911840669699c0a09acb2fd7ffa012fe)
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-08 13:46:33 +0000