summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* Don't grab QWhatsThis background on WindowsOliver Wolff2023-09-051-17/+0
| | | | | | | | | | | | | | The workaround also is no longer needed on Windows so it can be removed completely. This patch amends 6a28b391f71d8626c1793aa3bf732dea10519653. Task-number: QTBUG-113556 Change-Id: I69155e54da26acd49faf72816d1439fb3e322de9 Reviewed-by: Wladimir Leuschner <wladimir.leuschner@qt.io> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit 47e63d436ea411431101f9d64d0365f02f15c82f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Doc: Add CSS styling and icon for 'technical preview' itemsTopi Reinio2023-09-055-2/+34
| | | | | | | | | | | | | | | QDoc adds a 'Status' field to the table on top of type reference pages. One common status for Qt modules/types is 'Technical preview'. Add an icon that is displayed next to the status description, highlighting the fact that the type is in tech. preview and therefore subject to change. Task-number: QTBUG-113026 Change-Id: Ibe6ca2a562cc7810fe27e7dcf514c711cd022894 Reviewed-by: Nicholas Bennett <nicholas.bennett@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> (cherry picked from commit 041e10e64f12b451b1e155b189c47bc91b745eb7) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Doc: Fix typoAndreas Eliasson2023-09-051-1/+1
| | | | | | | | | | It should read ISO-8859-1, not IS0-5589-1. Fixes: QTBUG-112735 Change-Id: I8247264d39f2af5b2f9699564cdd576df65cd9b8 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> (cherry picked from commit 4c34894075bc58023f6e52830739cf3c4d259614) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Revert "fix AT_SPI_BUS_ADDRESS actually working"Samuel Thibault2023-09-051-9/+2
| | | | | | | | | | | | This reverts commit be09628e151f26f602024bae6a957ffb27ac872d. because db346e711c9af50566c234cfc21199680e6cb499 avoids the issue entirely by calling this code after connecting the event. Task-number: QTBUG-43674 Change-Id: I72f5b161208aa3691e194f4ba7782d288602bbf3 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit 9a35bd02dc7b3474d958b7b85d58b5b50f7cb787) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* tst_QDeadlineTimer: use std::chrono_literalsThiago Macieira2023-09-051-47/+48
| | | | | | | | | | For greater readability. Change-Id: Ieec322d73c1e40ad95c8fffd17468e0c737bec0e Reviewed-by: Ahmad Samir <a.samirh78@gmail.com> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit 5c95cb872297748398d2ee8fb77d061dfd102538) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* qC{Debug,Info,Warning,Critical}: move the function call to the macroThiago Macieira2023-09-051-6/+1
| | | | | | | | | | | | | The change in commit 04ee5795cc31ee81fb0c27bf55d9e8f662995753 was source-incompatible if the function in question was a non-static member. I could add a new, template constructor to catch those, but this is simpler. Fixes: QTBUG-115043 Change-Id: I53335f845a1345299031fffd176f1071afbae7a9 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit ef9fe7a99a9a6779e7133167fe84426bfe9cc371) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* CMake: Fix linkage with lld 16.0Bernhard Rosenkränzer2023-09-053-14/+33
| | | | | | | | | | | | | | | | | | | | lld 16.0 is more picky about symbol versioning than previous versions (and other linkers such as ld.bfd, gold or mold). It now errors out if a symbol is versioned but not defined (see 8796677de8900dc154aef45f8620c3f987a40291). Outside of detecting support for symbol versioning (fixed by 462832), this causes linking Qt6 libraries other than Qt6Core to fail because their linker scripts try to add versioning to qt_version_tag, which is defined in Qt6Core rather than the library being linked. The obvious (and working) fix is to version qt_version_tag only where it is defined (Qt6Core), but this is not what the original intent seems to be. Task-number: QTBUG-111514 Change-Id: I963d417befb0f6b2260c57f059eeda1fe79200c9 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit 8f8be55c155edcfbec8b798d4eb7e084ae88bc88)
* Set color scheme after handling theme change in windowsSanthosh Kumar2023-09-053-4/+5
| | | | | | | | | | | | | | | | | | | | | | | Setting color scheme before handling theme change provides incorrect palette color when user switches from light to dark or dark to light. This is visible when using Fusion style (or other style that supports dark mode) in Windows. The change has been made as part of patchset 787038bb1d282b4d6c5c040d8e902ccac9befb41. It also has to be noted that handling palette changes to make further changes to the palette (or the style sheet), is less likely than Handling the colorScheme change signal and in this sense, this patch set can also be considered as an improvement. This patchset reverts that change and updates color scheme after palette change in the application. [ChangeLog][QtGui][ColorScheme] Update colorScheme property after palette change. Fixes: QTBUG-112653 Change-Id: I71bc413c56663fefdf9fe5871bbb19b7e6c3d9ff Reviewed-by: Axel Spoerl <axel.spoerl@qt.io> (cherry picked from commit 39882a1354cb06d2b0b0a0d5b41a168041df0476) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* wasm: Fix QFileDialog file filterPiotr Wierciński2023-09-053-109/+77
| | | | | | | | | | | | | File filter was not properly processed when using LocalFileAPI. The QtFormat->AcceptList conversion was happening twice, resulting in erronous types. This prevented dialog from appearing on Chrome. Additionally remove unused debug code. Fixes: QTBUG-115087 Change-Id: Ie6770e2f1d2aa7c3ad19f9ab105dbec8102d45fc Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io> (cherry picked from commit 62caae95784a2e70d46194622e96e0e6bdf13c28) Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
* Reset palette resolve mask in windows vista styleSanthosh Kumar2023-09-053-13/+61
| | | | | | | | | | | | | | | The palette set by windows vista style during polish doesn't allow style- sheet style to override it. This patch reset resolve mask for the palette set by windows vista style and thus it can be overridden. Fixes: QTBUG-115511 Change-Id: Ifcaf441f806cfa0273599b3dce83fdfaec3f5a66 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Axel Spoerl <axel.spoerl@qt.io> (cherry picked from commit 4cf92d83c3a8966fd1716939829fdbd4642810e9) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QMdiArea: port Q_FOREACH to ranged-for, loop could call QCA::sendEvent()Ahmad Samir2023-09-041-9/+41
| | | | | | | | | | | | | | Take a copy of the d->childWindows container because each loop body may end up directly/indirectly calling QCoreApplication::sendEvent() which means unbounded/unknown code could be invoked causing recursing into the class, leading to modifying the childWindows container while iterating over it. Task-number: QTBUG-115803 Change-Id: Ib62ba38700e8862940ba98fdeb663dd730ff125f Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io> (cherry picked from commit 875f988af5d9df6c85269959414014d6ef1417ad) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QMdiArea: port Q_FOREACH to ranged-for: loop doesn't change containerAhmad Samir2023-09-041-3/+3
| | | | | | | | | | | | | The container is childWindows in all cases: - place(): queries the windows' geometries - setChildActivationEnabled(): sets a bool member in subwindow->d - subWindowList(): {pre,ap}pends windows pointers to a separate QList Task-number: QTBUG-115803 Change-Id: I0fdd5f22f29f085b71bf46f68bf9ec04c45c9317 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io> (cherry picked from commit 79dc2980e69d1b568c3c80e30a3bd0af21548f22) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QMdiArea: port Q_FOREACH to ranged-for, one trivial caseAhmad Samir2023-09-041-1/+1
| | | | | | | | | | | Straightforward, the code was already iterating over a local const copy, i.e. Q_FOREACH wasn't needed here. Task-number: QTBUG-115803 Change-Id: I3e806c54ce56b6eb06431eea6aea1758c8ecd154 Reviewed-by: Ivan Solovev <ivan.solovev@qt.io> (cherry picked from commit a6274fa39ae865b20d395817f30a6f7c83bd5ea9) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QGenericUnixServices: ensure xdg activation token callback is calledIlya Fedin2023-09-041-1/+3
| | | | | | | | | | | | The callback doesn't get called if the signal is emitted immediately or if hitting the early returns Fixes: QTBUG-113995 Change-Id: Ib3e1d324a2becd8148cd76b4441fce5c4cc725e8 Reviewed-by: David Redondo <qt@david-redondo.de> Reviewed-by: David Edmundson <davidedmundson@kde.org> (cherry picked from commit d524f0a75632d8603e32b3ee7fe02138ff8343d1) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Use linear filtering again when QT_WIDGETS_HIGHDPI_DOWNSCALELaszlo Agocs2023-09-042-29/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | In ec27b99c2a16994127f77d76eb1fb466c390aee9 the filtering mode is changed from Linear to Nearest since users encountered obscure cases, in particular when multisampling with large sample counts got enabled, where the different filtering mode becomes noticeable. (Qt 5 and Qt 6 up until 6.4 uses Nearest, whereas the OpenGL -> QRhi migration introduced using Linear in 6.4) Meanwhile, the as of now undocumented high DPI downscaling feature got introduced, and that prefers linear filtering. (since that's definitely not a 1:1 mapping when it comes to texture size and the on-screen quad) To reconcile the differences, add support for both kind of samplers, and choose based on the sizes. This should have no effect when not running with the env.var. QT_WIDGETS_RHI=1 QT_WIDGETS_HIGHDPI_DOWNSCALE=1 set, but should restore the pre-6.5.2 look when they are set. Fixes: QTBUG-115461 Change-Id: I42eb8526cb7f74236b5550e26c4570771d2fbfb4 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io> (cherry picked from commit 9505305c403423f58e70471aaf55994bb734a0bd) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* tst_QString: deduplicate datatagsMårten Nordheim2023-09-041-9/+9
| | | | | | | | | | By saying what's special about some of them Change-Id: I17bf2e12a27bf55f621020ddf3819ee9e606847d Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> (cherry picked from commit 6577242adff254724c739637a92372839c29da04) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* syncqt: Close ifstream before attempt to remove fileAlexey Edelev2023-09-041-2/+7
| | | | | | | | | | | ifstream may block the file descriptor in some operating systems. Wrap the reading of files in staging directory with extra scope, to make sure that ifstream closed the descriptor before the removal attempt. Also make sure that we closed the ifstream explicitly. Change-Id: I56ef5e9925501912d5cd61e8545f664e0a0d90b8 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit 3115610cfa37b1341392039537299aea4a0b5d93)
* Allow generating deprecated header files cross-moduleAlexey Edelev2023-09-041-14/+42
| | | | | | | | | | | | If some header files were moved to another module within same repo it makes sense to allow deprecating them. 'syncqt' now is able to detect this kind of header files if the 'foreign' module is specified in qt_deprecates pragma as part of the deprecated header name. Task-number: QTBUG-116483 Change-Id: I479ea60e71de112b67c281722600cd818aac7762 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit 7e84a04563142d217317928865a8f6475d189d95)
* Add the 'version' argument to 'qt_deprecates' pragmaAlexey Edelev2023-09-041-11/+73
| | | | | | | | | | | | | | | | | | | | | | syncqt uses qt_deprecates pragma to generate deprecated header files that might live forever in Qt packages. This adds the version argument to the pragma, that allows specifying the version when the respective header file should be removed. The new pragma format is the following: pragma qt_deprecates(<header>[,<major.minor>]) If deprecation version of the deprecated header file is lower than the current Qt version, syncqt will display the respective warning in the log and skip generating the deprectated header file. Also the user warning message now displays the exact version when the header file will be removed. Task-number: QTBUG-115029 Change-Id: Ifd7464b8539b8be93b95690fd1ca70ef0b14e436 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit 4bc0a08bea3c262ebda26163f9271c946c430ff0)
* QAnyStringView: fix construction from QL1SV for bootstrapped buildsIvan Solovev2023-09-041-1/+1
| | | | | | | | | | | | | | | | The SizeShift was not taken into account when constructing QASV from QL1SV. This is not an issue in normal Qt builds, because SizeShift == 0 there. But in bootstrapped case (and in future Qt 7) SizeShift changes to 2, and the bug becomes visible. The tests that were available on dev were never picked to earlier branches, so the cherry-pick skips the test improvement. Change-Id: I337b37b5230323a5357f48fd1c9bf799ca507d52 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> (cherry picked from commit d752da1857358726b89027ac039c20c1cd696b36) Reviewed-by: Marc Mutz <marc.mutz@qt.io>
* QList/Doc: document the resize() overload taking a parameter_typeThiago Macieira2023-09-011-2/+3
| | | | | | | | | | | Added by commit b42a2b3c3338a320a438bc081cb885fd4547f01f for 6.0, but we forgot to document it. Change-Id: I2b24e1d3cad44897906efffd1780086b51c0e3fa Reviewed-by: Topi Reiniö <topi.reinio@qt.io> Reviewed-by: Lars Knoll <lars@knoll.priv.no> (cherry picked from commit a15fef35ff9f78a2c16c31cc106175453d5ecfe0) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* tst_QFileInfo: replace a portion of a macro with a lambdaThiago Macieira2023-09-011-6/+8
| | | | | | | | | | It's very hard to debug a macro. Change-Id: I2b24e1d3cad44897906efffd17803b8eac9bd844 Reviewed-by: Ahmad Samir <a.samirh78@gmail.com> Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> (cherry picked from commit 9e8c93fac10b802448b6b7938054220984734434) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* tst_QFileInfo: don't trigger libstdc++ std::filesystem bugThiago Macieira2023-09-011-0/+3
| | | | | | | | | | | | | libstdc++'s std::filesystem::path implementation incorrectly assumes that any 8-bit char input is UTF-8, when it patently isn't on Windows. Reported at https://gcc.gnu.org/bugzilla/show_bug.cgi?id=111244 Fixes: QTBUG-116609 Change-Id: I2b24e1d3cad44897906efffd17803f2862935c9b Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> (cherry picked from commit 2b06d41b46cf97a92dee10c4432cdc5c719bcee0) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QAccessible: consistently respect rootIndex of item viewsVolker Hilsheimer2023-09-015-86/+207
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Accessibility implementations rely on correct information about the model dimensions when operating on item views. An item view that has a root index set needs to report it's size based on the root index, rather than for the view's model directly. Pass the rootIndex to all calls to QAbstractItemModel::column/rowCount. Refactor the code to avoid excessive dereferencing of a QPointer, apply const and fix/improve coding style in touched lines. Emit a ModelReset notification when the root index changes, or (in the case of QListView) when the model column changes. Split long Q_ASSERTs into multiple lines to be able to better trace the exact reason for an assertion, and replace the assert with an early return of nil when it's plausible that a cached cell is no longer part of the view (i.e. because the root index changed). Add a test case that verifies that changing the root index changes the dimension of the view as reported through the accessibility interface. Fixes: QTBUG-114423 Change-Id: I7897b79b2e1d10c789cc866b7f5c5dabdabe6770 Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io> (cherry picked from commit c59b34b8cf1c2a087e361d4235990803d89d34ec) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* tst_qsslkey: Fix CMake conditionAxel Spoerl2023-08-311-2/+2
| | | | | | | | | | | | | | | | Private libraries and WrapOpenSSL were linked conditional to QT_FEATURE_private_tests in the CMake file. qsslkey_p.h and open ssl symbols were included conditional to developer build. A developer build fails, with test enabled and private tests disabled. => Change the CMake condition to QT_FEATURE_developer_build, to resolve mismatch between CMake and cpp file. Change-Id: I3ac93b02701e467a0b548c35d441d35a45c4568b Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> (cherry picked from commit 70b57c943ad981ffe2e519fc0ab7176f83dafcd4) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Image Gestures Example: use QFileInfo for images file namesAssam Boudjelthia2023-08-312-9/+18
| | | | | | | | | | | | | | | | | | | | The example keeps around image file names only and append them to the selected dir path, that works fine for file scheme files, but for Android with content scheme files, that doesn't work as good because usually the paths are returned by a provider and managing them manually like appending a file name to a directory (tree) path might not work. This patch retrieves QFileInfo objects and use the absolute file paths to open any image. Fixes: QTBUG-116181 Change-Id: I9911a181d92ba0452500398cbe052b9583bd79a0 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> (cherry picked from commit 381612f7944b202c8b1428f0cc9d1af72f5f7647) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* tst_QSplitter: fix compiler warningAxel Spoerl2023-08-311-1/+1
| | | | | | | | | | | | | | | QLabel *l is declared uninitialized, assigned in a for loop. The last object is deleted for testing purposes. This leads to a false compiler warning about deleting a potentially unintialized pointer. => initialize with nullptr to silence the warning. Change-Id: I1422b04fc1fdbfc7248de577884aabfb539f3f4b Reviewed-by: Doris Verria <doris.verria@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> (cherry picked from commit 41c8d215f273c048d76c51de4c56cb55c4325c85) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QItemSelectionModelPrivate: use QObjectPrivate::connectAxel Spoerl2023-08-314-60/+105
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QItemSelectionModelPrivate::initModel() uses string based connections, to connect/disconnet its QAbstractItemModel. The QObject::destroyed signal is connected to modelDestroyed(), which does not disconnect other signals. QQuickTableView's selection model binds to its QAbstractItemModel. The binding also reacts to QObject::destroyed Eventually, QItemSelectionModel::setModel(nullptr) is called. At this point, only a QOBject is left from the QAbstractItemModel. That leads to warnings about disconnecting string based signals, which belong to QAbstractItemModel. This patch changes the connect syntax to the QObjectPrivate::connect API. Instead of keeping a list of string based connections around, the connections themselves are kept in a list member. Disconnecting happens based on that list. Connections are also disconnected in QAbstractItemModelPrivate::modelDestroyed. An auto test is added in tst_QItemSelectionModel. Fixes: QTBUG-116056 Change-Id: I57e5c0f0a574f154eb312a282003774dd0613dd6 Reviewed-by: Ahmad Samir <a.samirh78@gmail.com> Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io> (cherry picked from commit 4f4a8e75ab34003a4a49b89392ae7712415ac788) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* tst_qstatictext: Fix CMake conditionAxel Spoerl2023-08-311-1/+1
| | | | | | | | | | | | | | | Private libraries were linked conditional to QT_FEATURE_private_tests in the CMake file. qstatictext_p.h was included conditional to developer build. A developer build fails, with test enabled and private tests disabled. => Change the CMake condition to QT_FEATURE_developer_build, to resolve mismatch between CMake and cpp file. Change-Id: I79213e7d3c38851b8b80cb8ab248d7bff750c227 Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> (cherry picked from commit 38380de63c53b27dc85a1ba49e1ffade1c183fdd) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Remove dead code in QMessageBoxAxel Spoerl2023-08-311-10/+0
| | | | | | | | | | Remove code guarded by #ifdef 0 Task-number: QTBUG-115832 Change-Id: I7d1dfd3dca2d8cda455d73f90dc2ae142ea41118 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> (cherry picked from commit b2f4e1e395bba4b72d5e1d5cc6e4469b97731a65) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Enable binfmts incase it is disabledCasimir Saastamoinen2023-08-311-0/+8
| | | | | | | | Task-number: COIN-1075 Change-Id: I476833e87af213b4fd7eced4accdc19f093c6824 Reviewed-by: Toni Saario <toni.saario@qt.io> (cherry picked from commit d4cccd0471cd5b57c900ef13e5dedd30f79f9de7) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QLocale: Add Q_ENUM registration for some enumsOlivier De Cannière2023-08-311-0/+2
| | | | | | | | | Fixes: QTBUG-116527 Change-Id: If04bd5f504b3a8a39a35b9ba7024cdc9eb2d154a Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> (cherry picked from commit f9dccd05d3ff4bb403b8ad66f641695c9a00ee1d) Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* OpenSSL: move DH calls under OPENSSL_NO_DEPRECATED_3_0 guardTimur Pocheptsov2023-08-312-13/+26
| | | | | | | | | | | | | Initially, DH functions were deprecated, but when OpenSSL v3 was released, they changed their mind (now they changed it again). OpenSSL must be configured with 'no-deprecated'. Fixes: QTBUG-83733 Change-Id: I69f14929e91f5fc147f9297f6fff20674e81b6f1 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> (cherry picked from commit 8051edfdb5efcafd76b178990b8ff760342aeee3) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* a11y uia: Don't return "S_OK" and null text rangeMichael Weghorn2023-08-301-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When QWindowsUiaTextProvider::RangeFromPoint was called with a point that is not over any character, it was previously returning S_OK and a nullptr for the text range. This is contrary to what the ITextProvider::RangeFromPoint documentation [1] says: > If this method succeeds, it returns S_OK. > Otherwise, it returns an HRESULT error code. and > The property never returns NULL. Therefore, setting pRetVal to NULL and returning S_OK at the same time is problematic. Return UIA_E_ELEMENTNOTAVAILABLE instead for that case, and only return S_OK when actually setting a valid text range provider as well. Ideally, this should return an empty range for the character that is closest to the given point. That one could be identified by iterating over all characters and calculating their distance to the given point, but that would be too expensive. [1] https://learn.microsoft.com/en-us/windows/win32/api/uiautomationcore/nf-uiautomationcore-itextprovider-rangefrompoint Fixes: QTBUG-115801 Change-Id: Ib08d02677935a45517c937613785f1e3f53ee032 Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io> (cherry picked from commit 9900a12df649229c9ff9e2115ac90fb7f634da1d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Revise [since 6.7] to [since 6.5.3] for new CLDR enum itemsEdward Welbourne2023-08-301-5/+5
| | | | | | | | | | | | | Their introduction got picked back to 6.6 and 6.5 to fix a bug reported as they were landing in dev; so 6.6 and dev are now being updated to say [since 6.6] but they didn't make 6.5.[0-2], so they're only [since 6.5.3] for the purposes of 6.5. The lack of any pick-to here is, of course, deliberate. Change-Id: I8ca1ca03bb3b9c4107fba3063946f35123b8f3ec Reviewed-by: Topi Reiniö <topi.reinio@qt.io> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* QMdiArea: port Q_FOREACH to ranged-for, d->pendingPlacementsAhmad Samir2023-08-301-1/+6
| | | | | | | | Task-number: QTBUG-115803 Change-Id: Ibf2f049aacad925fea318c0ec490749e68e05b1d Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io> (cherry picked from commit 446af298b0c00a419ff8e373e6b2917fd2af44eb) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QMdiArea: port Q_FOREACH to ranged-for, d->pendingRearrangementsAhmad Samir2023-08-301-1/+3
| | | | | | | | | | | | Take a copy of the member container as the loop may modify the container (either by moving/reordering the Rearranger elements or by appending). Task-number: QTBUG-115803 Change-Id: Iaf891b29e9c7cdfdb3dc82e03ed94defb8d0cf4c Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io> Reviewed-by: Ivan Solovev <ivan.solovev@qt.io> (cherry picked from commit cfec14e1ff94b05bdfe15294199964247dbac518) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Doc: Add \examplecategory to qtguiSafiyyah Moosa2023-08-304-0/+4
| | | | | | | | | | Remove rhiwindow.qdoc example from 6.5 as this example was only introduced in 6.6 Task-number: QTBUG-116068 Change-Id: Ia0bdc2122434adac51b37ba2207a2b0b993cf19b (cherry picked from commit 3b187f14a1f80ac6893b5f7b5df9194691bc955c) Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* Revert "Windows QPA: Change monitor index detection"Timothée Keller2023-08-301-7/+7
| | | | | | | | | | | | This reverts commit f4d6d04898bcc239f4b271330ba778de69bbd893. Reason for revert: EDID serial numbers can be shared across monitors, so the move to EDID serial number for screen index detection does not work as intended,and breaks monitor detection. Fixes: QTBUG-116499 Change-Id: I6995b21788eb632e38eeef3a93492dbe0740da4a Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> (cherry picked from commit 695948fad028f97521135ecb3478f2798ae6700f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Android: fix handling of tree content uri with sub-documentAssam Boudjelthia2023-08-301-1/+1
| | | | | | | | | | | Check for the index of last '/' from the non-encoded path. Amends ea75e34d6968bb59624874411e793c95b26d0dbe. Change-Id: I3ef5d454a46c711a85fe7ef01ea9d3d93a2d574f Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io> (cherry picked from commit 4721721f6005c90cb1760b0c6e074468aa73512f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QString: use qustrlen() in the QChar* constructorThiago Macieira2023-08-301-5/+2
| | | | | | | | | | Instead of a manual loop, which was there since at least Qt 4.5.1 (beginning of the public history). Change-Id: Ifa1111900d6945ea8e05fffd177dd3dfea450a67 Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> (cherry picked from commit 9c70e117114b51d3c72283d976048e2768968039) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* tracepointgen: Fix double comma in enumsAntti Määttä2023-08-291-0/+4
| | | | | | | | | Remove commas at the end of the lines. Change-Id: Idf731ac5de64787276c1fdf798eb429b8f73213b Reviewed-by: Janne Koskinen <janne.p.koskinen@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io> (cherry picked from commit 38c8eb8564495b0fe345eaca700966889f1f8aa3)
* QTextFormat: documentation fixChristian Ehrlicher2023-08-281-1/+1
| | | | | | | | | | | | | The QTextFormat description refers to setDirection() but this function does not exist. The correct function name is setLayoutDirection() even in Qt4. Change-Id: I2d1f49fba558874b5875d8d93ef61d6208134609 Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io> Reviewed-by: Kai Köhne <kai.koehne@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> (cherry picked from commit fd96e11bb1200902ff7ec2bbe6f3903b2d96bdd8) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Doc: Remove links to removed examplesAndreas Eliasson2023-08-281-5/+4
| | | | | | | | | These examples have been removed as part of the examples revamp project. Change-Id: I2a8237334a2acae2735c2dbd86004048d288896a Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit 41f032e358e704693834a98d37331d0d63b7aab9) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Exclude some examples from Android buildElias Hautala2023-08-2812-9/+47
| | | | | | | | | | | | | Excludes dnslookup, waitconditions, semaphores, cbordump, savegame, convert, pingpong and complexpingpong examples from Android build because of missing Qui and Quick dependenies. Task-number: QTBUG-111933 Change-Id: Ied01f62ee61a9220dcb44c13fda46f6a5e158293 Reviewed-by: Rami Potinkara <rami.potinkara@qt.io> Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io> (cherry picked from commit 39a5ed4bdd348d3cd18a08d322b48d85e8d116e8) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* SQLite: Update SQLite to v3.43.0Christian Ehrlicher2023-08-283-2303/+5525
| | | | | | | | | | | [ChangeLog][Third-Party Code] Updated SQLite to v3.43.0 Fixes: QTBUG-116248 Change-Id: I039f572d21a8506faa5e29a48cdc7e40f990d946 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Kai Köhne <kai.koehne@qt.io> (cherry picked from commit 49e52e8dd68cc58b9c9ec9bd2c1f89184845d746) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* wasm: remove 'shift' from being inputed on touchscreensLorn Potter2023-08-262-6/+18
| | | | | | | | Fixes: QTBUG-116231 Change-Id: Icbbe80877c2c21c3e82ba2c27909b6679b72e498 Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io> (cherry picked from commit 91d3c48d3da5f75e126bbce79096a84c078e23e2) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Blacklist tst_QMainWindow::QTBUG52175_tabifiedDockWidgetActivatedTimur Pocheptsov2023-08-251-0/+2
| | | | | | | | | | We are BLACKLISTing on macos/arm - the test is flaky. Task-number: QTBUG-115945 Change-Id: I3be28c895d46ce5ba86e00d597016334bdb16021 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> (cherry picked from commit a3cbbe449a1946d1f50930859efe5f003cf6fda6) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QGuiApplication: Report default platform name before initializationPasi Petäjäjärvi2023-08-251-2/+14
| | | | | | | | | | | | | | | | Calling this function before we had a QGuiApplication instance, would return an empty string, even if QT_QPA_DEFAULT_PLATFORM_NAME was defined at compile time. We now return the default platform name [ChangeLog][QtGui][QGuiApplication] QGuiApplication::platformName now reports the default platform name if QGuiApplication hasn't been instantiated yet. It used to return an empty string. Change-Id: Iffe7cde8943ed2d186bc494d0920b9cf79389dd0 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit dd3840a1a201318c8f089dc7d34ec38f64e05b4e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Doc: Document TR_EXCLUDEJoerg Bornemann2023-08-252-0/+41
| | | | | | | | Change-Id: Ib2e06e46f44564a2c7581ff4d7f3d8a29d2756c9 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Kai Köhne <kai.koehne@qt.io> (cherry picked from commit bfca8c6d2447558609b4cce71d112a8ab34b8bec) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>