summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
...
* Http2: Handle failed read from QDecompressHelperMårten Nordheim2021-10-081-0/+5
| | | | | | | | | | | If the data is corrupt or the underlying library fails to read, the decompressHelper gets reset and we must not try to call it again. Emit an error since we cannot work with the data. Task-number: QTBUG-97179 Change-Id: I62c49fb2fbb2cd942c82a08937f817b6c762c883 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
* Doc: Prettify -G cmake arguments in SQL drivers documentationJoerg Bornemann2021-10-081-17/+17
| | | | | | | | | Use '-G Ninja' instead of '-G"Ninja"'. Change-Id: I53a77ea3b2d1547bb516b3ab756f5ae0f24092b1 Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit 08a0ba5733c0b01d9ff65ccffcc3b9ba77df7af9) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Doc: Fix cmake build/install commands in SQL driver documentationJoerg Bornemann2021-10-081-33/+32
| | | | | | | | Fixes: QTBUG-97098 Change-Id: I1c5214d66341aa412c5fc9b2de6d0e26ba4612aa Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit bf9f0844c232d5395b32ab8e3bbe644a8af310f7) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QNI:NetworkManager: Update dbus interface usageMårten Nordheim2021-10-082-6/+12
| | | | | | | | | | | | | | | | | We were using the non-standard interface for PropertiesChanged, and support for this was dropped in a Network Manager update earlier this year[0]. Switch to using the standard interface. [0] https://networkmanager.dev/blog/networkmanager-1-32/ Change-Id: Ibdf2b635ae13a3150c4d2faa028c15c70c8af5ca Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Ievgenii Meshcheriakov <ievgenii.meshcheriakov@qt.io> (cherry picked from commit 5d941c76604a534712f58ff9467f3c27083bf50c) Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* QCocoaWindow: Make window key if the app's modal window is hiddenDoris Verria2021-10-081-1/+3
| | | | | | | | | | | | | | | | | | | | | On macOS, when showing a window, we decide if it should be made key and therefore active, if the app has no active modal session or if the window's worksWhenModal returns true. However, the window needs to be made key also when a modal window is present, but not visible. Add this condition when checking if the window needs to be made key. This makes the behavior consistent with what happens when a modal is minimized on macOS. The input focus is passed to the next window, and the window appears active, even if it can not be interacted with. Fixes: QTBUG-85574 Change-Id: I204d4f912128f4a46840789fc2ee08e1b2716bfc Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit 911c97f2b59945093e9e87130d687c6a2a9423ac) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* gl: Try the local CacheLocation when the shared one failsLaszlo Agocs2021-10-082-20/+45
| | | | | | | | | | | | | | | | | | | | | | | We prefer the shared cache path, because there is no reason to give up benefitting from sharing the content between applications. If that path is not QFileInfo().isWritable(), we fall back to the local cache path. However, there are reportedly systems with security solutions such as AppArmor where the writable check passes and yet attempting to create a file still fails. Then there is no cache in effect, because nothing ever gets written out. Handle this better: if writing the file fails and we still use our first choice, the global cache location, fall back to the secondary choice (the app-local path) and try again. Fixes: QTBUG-96789 Change-Id: Ifea32e9af0cf85aa70f3069256ed3d6a7e2fbe90 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Dalton Durst <dalton@ubports.com> Reviewed-by: Andy Nichols <andy.nichols@qt.io> (cherry picked from commit 46e6a9a759ae89f905107ccad191ca5ddf442e53) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* rhi: metal: Query supported sample counts from the deviceLaszlo Agocs2021-10-082-1/+8
| | | | | | | | | | | Check if 2, 4, 8 are actually supported. Fixes: QTBUG-97146 Change-Id: I23c22c2bfeb072b9658f3b5dfba51dd6dc850de3 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Andy Nichols <andy.nichols@qt.io> (cherry picked from commit cef788f398568b07c28e2e4f364c84d7006d9ab9) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Doc: clarify case sensitivity in QCompleterMitch Curtis2021-10-081-6/+9
| | | | | | | | | | This was confusing for me, being unfamiliar with the API. Change-Id: I831c6d0aa30847e069a7c21c279f147a1b24e486 Reviewed-by: Paul Wicking <paul.wicking@qt.io> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit 3fbf1f13ae4c091c15cbba873cc36e2c3e39e0fe) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix handling of grouping characters when validating doublesEdward Welbourne2021-10-081-12/+16
| | | | | | | | | | | | | | | | | | | | In QDoubleSpinBoxPrivate::validateAndInterpret() some code still assumed checking one entry in a QString is enough (it isn't - the grouping separator may be a surrogate pair) and nothing considered the case of an empty grouping separator (as can arise if the user sets that in their system configuration, as a brute-force way to suppress digit-grouping). Failure to consider this case failed an assertion on dereferencing the first character of the separator. Handle the case of empty separator and suppress tests that try to match a separator, when there is no separator. Fixes: QTBUG-96734 Change-Id: I63d3205ef8656a2cd2c0d855a25e712ad66e2429 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit c1281c306c1304374cb7ba1c341db71b584bf6c6) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QtTest: fix build with MinGW/GCC 9: no std::mutex supportThiago Macieira2021-10-081-9/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unfortunately we can't depend on the C++11, 14 or 17 Standard Library, which is not properly and completely implemented everywhere. All Library features above C++98 must be checked with their corresponding __cpp_lib macro before use. This does not apply to the C++17 Core Language. qwaitcondition_p.h:144:20: error: 'mutex' in namespace 'std' does not name a type 144 | using mutex = std::mutex; | ^~~~~ qwaitcondition_p.h:59:1: note: 'std::mutex' is defined in header '<mutex>'; did you forget to '#include <mutex>'? 58 | #include <condition_variable> +++ |+#include <mutex> 59 | #include <mutex> qwaitcondition_p.h:145:33: error: 'condition_variable' in namespace 'std' does not name a type 145 | using condition_variable = std::condition_variable; | ^~~~~~~~~~~~~~~~~~ qwaitcondition_p.h:59:1: note: 'std::condition_variable' is defined in header '<condition_variable>'; did you forget to '#include <condition_variable>'? 58 | #include <condition_variable> +++ |+#include <condition_variable> 59 | #include <mutex> Change-Id: I2bbf422288924c198645fffd16a9249e5330136a Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> (cherry picked from commit 1bac82fa99c4abb33dcf99fa588d72e6cf95d496) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix compilation with -traceFabian Kosmale2021-10-071-1/+1
| | | | | | | | | | Fixes: QTBUG-97241 Change-Id: I877c6f0792ad2281ccfc73b7549dad7d6bd68995 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> Reviewed-by: Ievgenii Meshcheriakov <ievgenii.meshcheriakov@qt.io> Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> (cherry picked from commit d9f6fba3854f778124e6f8b1bda0994b42cd7988) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* macOS: Use new QPlatformTheme::appearance() functionMitch Curtis2021-10-071-20/+21
| | | | | | | | | Instead of qt_mac_applicationIsInDarkMode(). Task-number: QTBUG-94859 Change-Id: Ib64c081adfafb2843a7593d0e35668cce70cffd0 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> (cherry picked from commit fae419a8e61235e40c380cf81f9952661078b2de)
* Add QPlatformTheme::Appearance for detecting light/dark modesMitch Curtis2021-10-076-0/+27
| | | | | | | | | | And implement it on Windows and macOS. Fixes: QTBUG-83908 Fixes: QTBUG-94859 Change-Id: I7b0c062adf5d4dbaefa64c862ab8ab1348809d71 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> (cherry picked from commit 2248487c6ca9d5459c70a16868d5aeee07d96157)
* Revert "Support family names that end/start with space"Eskil Abrahamsen Blomfeldt2021-10-071-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 7fd9ed32012bd9001e78ad692a4802e0e3366e44. While trimming the font name worked for cases with application fonts, it actually introduced an assert for system fonts that ended with a space, because enumerating these failed. So the original assumption that all Windows APIs also trimmed the family name was wrong. The original bug was that the font with the trailing space could not be selected, but when using setFamilies(), it can. So there is a perfectly fine way around the original bug when using a font that has this problem. Therefore, no additional fix is needed for that. [ChangeLog][Windows] Fixed an assert that happened when the system had a font with a trailing or leading space in its name. Fixes: QTBUG-93885 Task-number: QTBUG-79140 Change-Id: I6d9df31a4f2c6555d38d51da374f69b6fb0f1ecb Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from commit 4d47b18c81f74ae6855e16197a12b69a6bcfe68a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QTlsBackend (OpenSSL) : detect incompatible versionsTimur Pocheptsov2021-10-061-1/+13
| | | | | | | | | | | | | | OpenSSL v3 among other nice things brought some nasty crashes (essentially, finally breaking what was already not so nice in 1.x: see, e.g. ASN1_ITEM_free and ASN1_ITEM_ptr that we have to use to free resources allocated by openssl). Let's, at least, not use v3 from Qt built with 1.1.1 and vice versa. Change-Id: If14a2a0ce2189a1b7967b7ab7248d11d0f2fc423 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> (cherry picked from commit 3abcff49eb962cb087498626d77929a870c82929) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Android: Update and add missing gradle files for jar foldersAssam Boudjelthia2021-10-067-7/+126
| | | | | | | | | | | | | Update the build.gradle for main Qt jar code, and add same files for network and network information backend, so the code can be managed from Android Studio. This also adds .gitignore to ignore Android Studio build artefacts. Change-Id: Ic06e9d12708070fad112f17e58b8754608d184f3 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> (cherry picked from commit b02d88e416769857e56f310cdad7348767304b59) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Android: use gradle repo mavenCentral() instead of jcenter()Assam Boudjelthia2021-10-061-2/+2
| | | | | | | | | | | | jcenter() is deprecated and will be shutdown by next year [1], thus the replacement mavenCentral() could be used instead. [1] https://blog.gradle.org/jcenter-shutdown Change-Id: Ic9d1c15d657f23712ee4c866d5c1a45706353429 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> (cherry picked from commit 3dbca82f861c8c83eea32560d5e63e1c71057d3b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix QPainterPath with QFont::SmallCapsAlbert Astals Cid2021-10-061-1/+1
| | | | | | | | | | | | | | | Previous code was getting the QFontEngine from the font+script instead of from the QTextEngine. The font+script is not enough information to know if a given character is smallcaps or not, while the QTextEngine actually has access to the information needed and returns a properly a scaled fontengine if character is small caps Fixes: QTBUG-13965 Change-Id: I9f95bd2f3c3bdff76c3acb94fa2edc99cdeb0a13 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit c89c14561671aa2ef2e5f7f35b26d8bce59ad77f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* macOS: Ensure cancelOperation is sent as regular key eventWang Chuan2021-10-051-1/+3
| | | | | | | | | | | | | | | Since 9e1875483ceaf907226f84cd6a58ab59f7f16f80 the logic of sending QKeyEvent was changed to only happen when we explicitly decided to not treat input as complex text, or when a selector for a command was not found. This missed the case where we handle cancelOperation by falling back to sending a regular key event. We now set m_sendKeyEvent to true to trigger this logic. Fixes: QTBUG-97119 Change-Id: Ibb72f4b068cce735db8d76e5e0a1882aae115207 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> (cherry picked from commit 60caec953f76b1c63ff526c84cc968b5f83eabdf) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* macOS: Disable PCRE JIT when running under RosettaTor Arne Vestbø2021-10-051-0/+6
| | | | | | | | | | | | | | | | | | Although the Apple docs claim that Rosetta can translate apps that contain just-in-time (JIT) compilers, it seems to have problems with the PCRE JIT. https://developer.apple.com/documentation/apple-silicon/about-the-rosetta-translation-environment To be on the safe side we disable the JIT explicitly when detecting that we are running under Rosetta. It's already disabled when we're running on macOS ARM natively (see 2f8df4d1a87df9dd67913b016171dac20839d16e). Fixes: QTBUG-97085 Change-Id: I0e133939f28087560d4bc8354b7e49013e94a9f9 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> (cherry picked from commit b689d8dccd3c260e88116285b7b75e827ca9954b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Support transformations in pattern/texture brushes in pdfEirik Aavitsland2021-10-051-0/+2
| | | | | | | | | | | | | The brush transform was ignored for pattern/texture brushes. Since fill patterns always have a transform in pdf anyway, we can just multiply in the brush transform. Fixes: QTBUG-96978 Change-Id: I80357f61fb879dfb1226d4ef9469ae5c9a9c1147 Reviewed-by: Lars Knoll <lars.knoll@qt.io> Reviewed-by: Albert Astals Cid <albert.astals.cid@kdab.com> (cherry picked from commit 2a546690bf457f4bfee0910ba979441511843f8b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* xcb: Flush scrolled region of backingstore to client when requesting imageTor Arne Vestbø2021-10-051-1/+6
| | | | | | | | | | | | | We were doing this for composeAndFlush already, which accesses the image via graphicsBuffer(). Task-number: QTBUG-64504 Task-number: QTBUG-64414 Change-Id: I51cc002db8a15991f8a8aa32e849c07318e6e74c Reviewed-by: Błażej Szczygieł <mumei6102@gmail.com> Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io> (cherry picked from commit 719990d4ef4729ba5e145306f555bcd73ea944e7) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Remove qshadergraph filesJuan Casafranca2021-10-0517-2852/+0
| | | | | | | | | | | | | - Those files were moved as part of Qt3D as its the sole user of these - Also removed associated unit tests Change-Id: I302bc219218a58071c86d2447cb4449601fca32c Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Mike Krus <mike.krus@kdab.com> (cherry picked from commit 0263cfdfa0162162df07d4a15f896c20a6aac9d2) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Doc: remove unnecessary newline in snippetKai Köhne2021-10-051-1/+0
| | | | | | | Change-Id: I6031fe8db971be4cbcaec8f1dc6fa7346edb601b Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit 461c3c58db217989df3dcc1f6fa8973617db7efd) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Doc: Do not highlight DTLS client/serverKai Köhne2021-10-051-3/+1
| | | | | | | | | | | | The client and server do in practice depend on each other. So setting up things is a tad more complicated, and the use case not big enough to warrant both to be highlighted. Task-number: QTBUG-96575 Change-Id: I0ed69f7a20ec490cc977bde7f1b09162153d0bd2 Reviewed-by: Alex Blasche <alexander.blasche@qt.io> (cherry picked from commit 2b48a4ebca9fc5165f010f0e17872f7a510737bc) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Doc: Make it explicit when CMake API is definedKai Köhne2021-10-0520-0/+55
| | | | | | | | | Task-number: QTBUG-96239 Change-Id: Iaa99024f98f5422aa39f148a89594186b40344bf Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit 214afbdddffc434414cc619557dd6426263f8193) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* CMake: Allow providing custom QT_ANDROID_SDK_BUILD_TOOLS_REVISIONAssam Boudjelthia2021-10-051-2/+5
| | | | | | | | | | | | The current CMake configuration sets QT_ANDROID_SDK_BUILD_TOOLS_REVISION only internally, taking the latest build-tools found. A project might still want to manually set specific build-tools version. Task-number: QTBUG-97002 Change-Id: I553563638160fdef7a27b9b334d1d9aae5d8b7e1 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit 2028b80b6b1fa726f428378d2cabfd01ddc2521d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* wasm: add simd supportLorn Potter2021-10-052-1/+8
| | | | | | | | | | | | | | | | | | | Emscripten only supports SSE1, SSE2, SSE3, SSSE3, SSE4.1, SSE4.2, and 128-bit AVX instruction sets at this time. https://emscripten.org/docs/porting/simd.html Browsers might need to enable simd support in the advanced configurations about: config or chrome:flags Enable by configuring Qt with -sse2 Fixes: QTBUG-63924 Change-Id: Ifeafae20e199dee0d19689802ad20fd0bd424ca7 Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io> (cherry picked from commit 0e100a4d892cbdcdb7f326213ec1e4d0d1ae6d89) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QEventLoop: remove unnecessary bits of Qt 5 suggestionThiago Macieira2021-10-041-3/+1
| | | | | | | Change-Id: I2bbf422288924c198645fffd16a974803ab43b7f Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from commit 96a1da00d29b2367643c82f75be7cdc1dad3e2a0) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Bump version to 6.2.1Jani Heikkinen2021-10-041-1/+1
| | | | | Change-Id: Id00b56284fcf15350d5e9f41b22e7259afbe27a3 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* Doc: Add overview pages to CMake APIKai Köhne2021-10-0421-15/+100
| | | | | | | | | | | | | | | So far the pages were only 'rooted' in the separate qtcmake documentation. Let them have a page per module too, so that it's easy to navigate. At the same time rename the cmake-macros-qtcore group to cmake-commands-qtcore. This will require a fixup in qtdoc repository. Change-Id: Ifc09b27a6c220b5feab64686ca47c60d3342e71a Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit e0ecb0ded21082f4e00ee77411339009cb1294a4) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix reference to quitOnLastWindowClosed in WA_QuitOnClose docsTor Arne Vestbø2021-10-041-1/+1
| | | | | | | | | The property is nowadays on QGuiApplication. Change-Id: I8759761b08b0cdcef786ca96a7fa6364331f157d Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit d78245ce8fc495ac7c771d045ba15da21e0732e2) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Doc: Add summary to CMake commandsKai Köhne2021-10-0421-41/+41
| | | | | | | | | | | | | For normal \page elements, \brief is just showing in the \generatelist or \annotatedlist commands. Make sure the description is also visible in the actual CMake command/variable/property page by defining a \summary macro. Change-Id: I12bc854d547059a2f6309a5922bb0b2a36d4e41c Reviewed-by: Craig Scott <craig.scott@qt.io> Reviewed-by: Topi Reiniö <topi.reinio@qt.io> (cherry picked from commit 23125b3f018f0dd27c761d2ba0e0dfca3d60b4f2) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Doc: Update Microsoft's Documentation LinksLuca Di Sera2021-10-043-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | The documentation links on `msdn.microsoft.com` now redirect to `docs.microsoft.com`. While the redirection works, our script to catch broken links on dev-snapshots builds of the documentation doesn't handle redirection correctly, reporting it as broken. Both to appease the broken-links script and to avoid an unneccesary redirection, the links were modified to point to the equivalent address in the new domain. Furthermore, the link to the `Winsock 2 Socket Handle` was moved to be an `\externalpage` link, as it was used in two different places. Additionally, the `\externalpage` link titled `Dirext X SDK` was removed as it was not used in any part of the documentation. Task-number: QTBUG-96127 Change-Id: I07f0ae8d610a7f8322b892a2fa37a5cc1769289e Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit fc73b585f8c0a6b08c2f931ac557793b74c5204a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Android: fix Gradle version in qt_attribution fileAssam Boudjelthia2021-10-021-1/+1
| | | | | | | | | | | | | The Gradle version in qt_attribution.json doesn't mention the actual version that is currently used. This amends 67c3f3f4ffcadba32ea42522a36b3f6d88fc3482. Fixes: QTBUG-71328 Change-Id: I50fbabd56beb44389f9453666822f9667bab7d61 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> (cherry picked from commit eb0a783e63cb848c8c004cc6b725a7f09af2c849) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Android: remove comments from the manifest fileAssam Boudjelthia2021-10-021-44/+6
| | | | | | | | | | | | The comments are not needed, since we're adding a docs page for the manifest, which include the information from these comments and more. Keep the manifest clean. Task-number: QTBUG-95285 Change-Id: I1fd8bc695f5aab1bcc69f549cb3ddeeaac168b98 Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io> (cherry picked from commit a1e7c441de16cb4e8d6bdac39160759116ecd233) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update PCRE2 to 10.38Giuseppe D'Angelo2021-10-0226-991/+1366
| | | | | | | | | [ChangeLog][Third-Party Code] PCRE2 has been updated to version 10.38. Change-Id: Ib6ab544790747a94a00b8eb516314ff3c57e4c79 Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from commit b4e290a9ab9bf1ba65002b6b6af6c9965595923b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix scrolling of QRasterBackingStore when operating on QRasterGLSurfaceTor Arne Vestbø2021-10-014-13/+15
| | | | | | | | | | | | | We were to strict in what surface type we allowed scrolling for. The RasterGLSurface type is an odd one, used by widgets to compose GL and raster content, which means we still have a raster backingstore we can scroll. It's just the flush that's different. Change-Id: Ia229c21c00ad38df9e87f4fc78e341e030ef228d Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io> Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> (cherry picked from commit 90c54b02f83961b1c66f10fe57bcfcf4523ebba1) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Disable the dnslookup feature for INTEGRITYJoerg Bornemann2021-10-012-1/+2
| | | | | | | | | | | | | | | | | | | The QtNetwork project file excludes the dnslookup source files for Unix, despite the dnslookup feature is always on. This inconsistency leads to linker errors when building applications against QtNetwork: (error #412) unresolved symbols: 1 QDnsLookupRunnable::query(int, const QByteArray &, const QHostAddress &, QDnsLookupReply *) from libQt6Network.a(qdnslookup.cpp.o) Turn the feature off for INTEGRITY and remove the condition from the project file. Change-Id: If086da51ca343f598eb273236e7b6338f5da1e97 Reviewed-by: Tatiana Borisova <tatiana.borisova@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit b88095e644d0845e4532edf0ccdbca3a33a68c08) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Don't export Qt6::ATSPI2_nolink target in Qt6GuiTargets.cmakeJoerg Bornemann2021-10-011-3/+11
| | | | | | | | | | | | | | | We don't have any APSPI2 includes in our public headers and should therefore not export the target that provides ATSPI2 include paths for consumers. Link against PkgConfig::ATSPI2 instead of the _nolink target. The former will not be exported. Fixes: QTBUG-97023 Change-Id: I4b12e0c2230917feeb963c02565e6db24f757bd3 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit f6cd55445d38cb5932f4cfcb5c6d4b9ac187c3eb) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Doc: Replace broken link to Roman Czyborra's personal pageLuca Di Sera2021-10-012-4/+4
| | | | | | | | | | | | | | | | | | | | | The `QFont` documentation refers to Roman Czyborra's personal page with the intent of providing information about encodings. The page seems to have been down for many years and may contain information that is now deprecated such that it is now replaced with a link to the Unicode Technical Report 17 about the Unicode Character Encoding Model. The new link was chosen as a substitute as it seems to cover or provide the intuition for, standing by the last captured version of Roman Czyborra's personal page on the Wayback Machine, many of the same concepts. Task-number: QTBUG-96127 Change-Id: Ibf901b5023688c14efb3d6f77a10609f7ba80e72 Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit c6ae39c45f4b2cdcd27990aeb10f9a7628646888) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Let QLocale::uiLanguages() use WinRT API when possibleIvan Solovev2021-10-012-2/+32
| | | | | | | | | | | | | | | | | | | This patch introduces support for the WinRT UI languages API. We are using the Win32 API to get the list of preferred languages when the system locale is used. However, this API returns an incomplete list. As Qt 6 supports Windows 10 and above, we can make use of the WinRT API, if it's supported by the compiler. This API returns the full list, as reported by the Windows system itself. Note however, that this API can't be used with Clang and MinGW, so we still have to fall back to Win32 API for these compilers. We also do it if WinRT API returns an empty list of languages for some reason. Fixes: QTBUG-94341 Change-Id: I1d23c68d2ec298ae7835d0d18718876ff041aede Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> (cherry picked from commit 51e8d3592acc8bacf326fe3933b5dec13bb518e6) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Include <QHash> explicitlyTimur Pocheptsov2021-10-011-0/+2
| | | | | | | | | | Not relying on some implicit include coming from other include. Fixes: QTBUG-96621 Change-Id: I11f6a20e98871eacee51ad723c484f25916c2882 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit f2de001d8410b85047ee40ebfff1b307a18889bb) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QWinRtFunctions::await() - introduce early exit conditionIvan Solovev2021-10-011-8/+19
| | | | | | | | | | | | | | | | | | | The await() method waits for the result of async operation in a non-blocking way (triggering processEvent periodically). It means that during this wait some other things might happen, and there would be no reason to wait for the end of the operation execution. This patch implements an additional parameter - a function that specifies a condition for an early return. When this function returns true, the await() method returns with E_ABORT, which makes it possible to distinguish it from timer expiration. Task-number: QTBUG-96057 Change-Id: Ide73d768b7cbb3a35be7160ce7555aeb2dca5235 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Juha Vuolle <juha.vuolle@insta.fi> (cherry picked from commit 1f86957f1dd14cc538e7ad9ffee4eb63001af407) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Doc: Use correct \relates targetPaul Wicking2021-10-011-2/+2
| | | | | | | | | | | | \relates takes a class name as argument, but doesn't deal nicely with a templates full definition. Task-number: QTBUG-97028 Change-Id: I7c608717c5d552bc553073534104dece01b8ff96 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Topi Reiniö <topi.reinio@qt.io> (cherry picked from commit 0acada9c7b6fb6a96145484da011aeec3191a35a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QFontCache: don't start cleanup timer if we are not in the main threadVolker Hilsheimer2021-10-012-15/+27
| | | | | | | | | | | | | | We can only start timers in threads started via QThread, and even then we cannot assume that the thread runs an event loop. So only start the timer when we are in the main thread. Add a test that verifies that we don't get the warning message. Change-Id: I40d7d9ff115720f9ecd3eedaebbade2643daf843 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit 132d6d012701ce00a4ff82eae5b14e560632e893) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QAbstractItemView: fix crash if setData() does a model resetDavid Faure2021-10-011-3/+10
| | | | | | | | Task-number: QTBUG-96654 Change-Id: I2dca4af387ef5ad549a1a41fba2bc6de217f4ea9 Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from commit 18bb10373aa06d258763a1f75e53acb397269ce4) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QAbstractItemView: Fix IM input starting edit sessionVolker Hilsheimer2021-10-012-21/+94
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Item views can open an editor widget on the first key press, and need to take special care not to break input methods. The initial key press starts compositing by the system input method, which is then interrupted by the focus transfer to the editor. To solve this problem, the widget needs to keep focus while the initial composition is ongoing, and only transfer focus to the editor once the composition is either accepted or cancelled by the user. Add a state flag that is set during this initial preedit phase. During this initial composition, the item view will receive all input method events, and needs to forward these to the open, but not yet focused editor for the user to get the correct visual feedback during the preedit phase. The item view also needs to report to input method queries on behalf of the editor to make sure that the IM UI is correctly positioned without covering the user input. Implement a test that simulates the sequences through synthesized QInputMethodEvents; we can't simulate the entire system input stack. Fixes: QTBUG-54848 Change-Id: Ief3fe349f9d7542949032905c7f9ca2beb197611 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io> (cherry picked from commit 79f62380f09988949bc601060ff5131cf34de872) Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Fix QDir::entryList to work for directories that end with '.lnk'Karsten Heimrich2021-09-303-5/+5
| | | | | | | | | | | | | | In addition to checking the .lnk extension, check that the the specified path is not a path to a directory. Fixes: QTBUG-85058 Change-Id: I83cef3d94c6ffa82a88f374c5b41779e88fe40b8 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> (cherry picked from commit 55ab987c9a518f217c02ca1382656ac97c53b307) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QDateTime: fix build with MinGW: need unistd.h very earlyThiago Macieira2021-09-301-3/+0
| | | | | | | | | | | | qobject.h has #include <chrono>, which #includes <ctime>, which includes <time.h>. datetime.cpp:2621:23: error: 'localtime_r' was not declared in this scope; did you mean 'localtime_s'? Change-Id: I2bbf422288924c198645fffd16a922719c4ce7d4 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> (cherry picked from commit 684c9b82b9b8216f406c59deb35cd727ffb6d69b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-10 02:11:13 +0000