summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Pass -arch when running toolchain configure test on Apple platformsv5.12.10Tor Arne Vestbø2020-11-031-0/+4
| | | | | | | | | | | | | | | Clang doesn't automatically switch architecture just because we're passing an iPhoneOS sysroot. In the past this resulted in a warning about trying to link an x86_64 binary to arm64 libraries, but with Xcode 12 this is now a hard error. Fixes: QTBUG-86718 Change-Id: I7e9d2ca513d276029fc2a6cfe694a35fe41c39b3 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> (cherry picked from commit ac43986aa5d07685cc61a5dbc00d76abf0cd1017) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 168438dc3144091fc7df7aa1d4b2f1d8f7a6b51c) Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Add changes file for Qt 5.12.10Antti Kokko2020-10-281-0/+109
| | | | | | Pick-to: dev 5.15 5.12 Change-Id: I49118e7699a158bc799aee3005ccdb740916d887 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* CVE-2020-15999: Heap buffer overflow in freetypeWerner Lemberg2020-10-211-7/+7
| | | | | | | | | | | | | Manual cherry-pick of fix in freetype: Fix heap buffer overflow (#59308). This is CVE-2020-15999. * src/sfnt/pngshim.c (Load_SBit_Png): Test bitmap size earlier. Change-Id: I23824074f134802b3e4f737877d144b59e6b8151 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit 0948846b42e0009ed2c9211c6995ce228db07032)
* sqlite: Upgrade to 3.33.0Andy Shaw2020-10-193-9937/+10673
| | | | | | | | | | | [ChangeLog][QtSQL][sqlite] Upgraded to v3.33.0 Change-Id: I379d8c62b449d4c6b04e5154c8c1a86761e5466e Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit a9982e64eb5108e5c4b51a4e5738c08eff6d07e7) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit f411be7a4a162ada96bca87cf21e939ae12ade5b) Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* Bump versionJani Heikkinen2020-10-141-1/+1
| | | | Change-Id: I071c06a4011a4f9c01efb841ae30008c9edc22aa
* Fix copyright year of tinycborKai Koehne2020-10-121-1/+1
| | | | | | | | | | | [ChangeLog][Third-Party Code] Fix aggregated copyright information of TinyCBOR component to reflect the years in the individual source files. Note that this is not same as the Copyright year in the upstream MIT license text. Change-Id: I238d973d937fbfc3a81627c4c65491fbb5cb3c30 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> (cherry picked from commit 7c12c8d113b9a7eae00e06ba75a6c6cce0d97d3d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Improve QWizard visuals for macOS dark modeDavid Skoland2020-10-121-10/+30
| | | | | | | | | | | | | | | | | | This did not account for macOS dark mode, with hardcoded white, but now it correctly updates the colors from palette whenever the theme is changed. Additionally changed some bool checks to make sure the code runs on macOS theme updates. Do note that this change affects Qt Maintenance Tool (in a good way). Change-Id: I6fb92d3f6c15a7ff83d0d8a30cf82477b6aba126 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> Reviewed-by: Katja Marttila <katja.marttila@qt.io> (cherry picked from commit 62fed23fefef0738ef55a17f96efd49e30313152) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Link to qAlpha in qRgb() and qRgba() docsMitch Curtis2020-10-121-2/+2
| | | | | | | Change-Id: I5a3b8573123e82f4c8c92fa7a2e1af06e2e84eb2 Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io> (cherry picked from commit 418389c3ed925b2da3538d808ceeb53727978a8c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Avoid heap-buffer-overflowRobert Loehning2020-10-121-1/+1
| | | | | | | | | | [ChangeLog][QCosmeticStroker] Avoid a heap-buffer-overflow found by oss- fuzz as issue 25243. Change-Id: I36112f183241679e172ad1ee531e1b929d6f3815 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io> (cherry picked from commit 1d778a59f781ecf822c9e3f7777b680fea2c4e62) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Avoid overflows in variantHash()Robert Loehning2020-10-081-2/+2
| | | | | | | Fixes: oss-fuzz-24702 Change-Id: I876bac9e2c276693e59802dfeeea2229a873ee34 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> (cherry picked from commit e0da5159dc4f53fcf725ef6e3aa4e04862bcbae0)
* Blacklist tst_QWidget::windowState on WinRTShawn Rutledge2020-10-071-0/+3
| | | | | | | | Task-number: QTBUG-75270 Change-Id: Icf1089b4d3681bc6a42be9c095acb5315dd67781 Reviewed-by: Gatis Paeglis <gatis.paeglis@qt.io> (cherry picked from commit 7718b708983cfcbd6fcb0e3b89519b2f8a02942d) Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* Revert "Blacklist tst_QWindow::exposeEventOnShrink_QTBUG54040"Liang Qi2020-10-041-1/+0
| | | | | | | | | | | | This reverts commit b1ef104866f78ae5bbc1214ae524bad4120ef0e2. This test is BPASS on openSUSE_42_3 for 5.12 and PASS on openSUSE_15_1 for 5.15. Change-Id: Ia1d81ed38491c27c01f270623c5082663f4da699 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io> (cherry picked from commit be7d46f5e2b8b4109bcb1ef1f5e765e87354aa9b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Avoid heap-buffer-overflowRobert Loehning2020-09-251-0/+2
| | | | | | | | | | [ChangeLog][QOutlineMapper] Avoid heap-buffer-overflow Fixes: oss-fuzz-24615 Change-Id: Ia67e1fb830850d04f068d8b5c009687f3deff156 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit 74146e0102d367c5e7a3567ad6bf8a46548d55de) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QFontEngine: Do not call getSfntTable with uninitalized valueChristoph Schleifenbaum2020-09-241-2/+2
| | | | | | | | | | | On FreeType font engine this results in a call to FT_Load_Sfnt_Table with a pointer to an uninitialized value passed in as FT_ULong* length, crashing. Instead initialize value to 0. Change-Id: I50d6df3b2296a05640d939e862bc50adb0fec921 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> (cherry picked from commit e041f5459660eaa7108fa5888e77e64f7d1b3d1d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* macOS: Don't assume NSSlider is never flippedTor Arne Vestbø2020-09-231-7/+7
| | | | | | | | | | | | | | We need to take into account the possibility that the slider is flipped, otherwise we end up with inverted rects, as noticed in Big Sur. The logic to use the ticks as input to whether the bar rect should be inverted didn't make sense. If the graphics context has been flipped, then we should reflect that through the slider. Change-Id: I3574027c14807460affb42a9763211981c4ed528 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> (cherry picked from commit e4f647e2720612d030e4a2240a00500054bbda99) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QXmlStreamReader: Don't resize readBuffer to a size it already hasRobert Loehning2020-09-221-1/+2
| | | | | | | | | | | Resizing it to 0 will cause it to allocate memory. This will then cause append() to copy the data from the other string instead of using copy on write. Task-number: oss-fuzz-24347 Change-Id: I581bd109f9b973e1c70b7b41b1f610a2ad5725b8 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> (cherry picked from commit 3e3fdbe831f24365780383b3c45a3d53f23ba435)
* QTextHtmlParserNode: Avoid extreme values for font's pixelsizeRobert Loehning2020-09-221-0/+2
| | | | | | | | | | | They currently cause an integer-overflow in variantHash(). Fixes: oss-fuzz-24702 Change-Id: Ibee4413ca766c8ade9aeff2f2052b82cb9f7d213 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> (cherry picked from commit 0bd770fb875d5391dd78df95542c25bd15051938) Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Gif decoder: fix read error caused by ub checkEirik Aavitsland2020-09-211-5/+7
| | | | | | | | | | | | The recently added check to avoid negative-bitshift ub ignored that the algorithm will sometimes use a negative bitcount value as a flag. This caused reading failure for some frames. Fixes: QTBUG-86702 Change-Id: I4c247a7eb6102f9b51cc8ac708c60db80d609e38 Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from commit f1c1f444811643acda66aaeb21a9e73a8e60e830) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Doc: Improve WinTab license informationKai Koehne2020-09-201-2/+2
| | | | | | | | | | | | | | | | | | Do categorize the license as LCS-Telegraphics License. Although SPDX doesn't know about the license (yet), DejaCode does: https://enterprise.dejacode.com/licenses/public/lcs-telegraphics/ So it's more helpful for the user to give the license a name, then to just call it 'Custom'. [ChangeLog][Third-Party Code] Changed classification of the wintab license from "Custom" to "LCS-Telegraphics License" Change-Id: Iba7538f67b43ceca2e599fc1ede520962d4a7e43 Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit 29ed90a147d0b4f65cc0a447e533af9338c6bdf4) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QDir: add note to docs about isAbsolutePath(":foo") returning trueAhmad Samir2020-09-201-1/+5
| | | | | | | | | | | | As can be seen in the _q_resolveEntryAndCreateLegacyEngine_recursive method in QFileSystemEngine, paths starting with ':' are treated as QResources, which means that from QFileInfo's POV they're "not relative", which is why QDir::isAbsolutePath would return true. Change-Id: I701d08ce43ea707bc34c928e39bea0b83597a4b6 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit 0da5726a43b21d1532720c8cd3c687cc2373cd2b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix a double deletion in QDomAttr::setNodeValue()Friedemann Kleint2020-09-191-1/+3
| | | | | | | | | | | Check the reference count before deleting. Patch as contributed on bug report. Fixes: QTBUG-86547 Change-Id: I2cb197e3eeda7ade2442c23f6b4f1ae6ff2ff810 Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from commit af22ccf5605c6b7b20b845fb2b4003d3f56d8bc9) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* xpm handler: fix read error caused by off-by-one in overflow checkEirik Aavitsland2020-09-181-2/+2
| | | | | | | | | | | | | | The recently introduced overflow check for 8 bit images was too aggressive, causing the last pixel on each line to be rejected. As a driveby, add the same (fixed) overflow check also for 32bit images. Fixes: QTBUG-86691 Change-Id: I62e4d5884e314f1171cb5a3e2c48657ce7259676 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit 6f2c7469f86785e6ba81fe0280210ef7275099de) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* macOS: Don't assume we will get didBecomeKey for non-Qt NSWindowsTor Arne Vestbø2020-09-141-9/+11
| | | | | | | | | | | | The optimization resulted in losing out on window focus changes when for example a native file dialog was shown, resulting in the cursor blinking both in the parent window, and in the native file dialog. Change-Id: I9c1f9df20fbc5c4b80f906ded70d9a2658b70438 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> (cherry picked from commit 5fbb17c39785ed2c80219c9c0ea97879e371d490) Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* Doc: explain how to blacklist QML tests on certain platformsMitch Curtis2020-09-111-2/+20
| | | | | | | Change-Id: Icd505175805820c64593d7eb8f580a51008e2e1a Reviewed-by: Daniel Smith <Daniel.Smith@qt.io> (cherry picked from commit a4e4436e852c600a7ecd13b83fc487164dbc5ad7) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Make clang-format ignore formatting of third party codeEirik Aavitsland2020-09-101-0/+2
| | | | | | | Change-Id: I865f86a1f9967971c4e525e634279a26ce11f688 Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit 7d27316d9fe736fd863dbd389571ee7906d6e559) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Avoid potential ub in corrupt bmp fileEirik Aavitsland2020-09-101-0/+2
| | | | | | | | | | | biHeight may be int_min, in which case qAbs<int>() will not work. Fixes: oss-fuzz-22997 Change-Id: Ic07d5aa0b4e4f2b6395e1a12d742e31b5282fdfc Reviewed-by: Robert Loehning <robert.loehning@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from commit 6f909a5178296855cdd53b053ced9c551a2474a6) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update bundled libjpeg-turbo to version 2.0.5Eirik Aavitsland2020-09-108-15/+47
| | | | | | | | | [ChangeLog][Third-Party Code] libjpeg-turbo was updated to version 2.0.5 Change-Id: I9d4c403fbc998243c32d1bf1f1fbaf53270ffb9c Reviewed-by: Liang Qi <liang.qi@qt.io> (cherry picked from commit e22c0368d8c4e2512b143e18264b1fb99856e343) Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* Update bundled libjpeg-turbo to version 2.0.4Eirik Aavitsland2020-09-0810-50/+93
| | | | | | | | [ChangeLog][Third-Party Code] libjpeg-turbo was updated to version 2.0.4 Change-Id: I7f74af0dc774a2172ff59713613a706e80d5b2cb Reviewed-by: Liang Qi <liang.qi@qt.io> (cherry picked from commit c3b6d09caef755171c8cd113e83b8f6f6f54cb7d)
* Cocoa: Translate the buttons used for the native font and color dialogsAndy Shaw2020-09-052-6/+7
| | | | | | | | | | | Use the QPlatformDialogHelper standard buttons to get the translated button text as then this will already have been translated for those loading a translation. Fixes: QTBUG-85725 Change-Id: Ia42d93aeb6e1b5c0528564a6c960a35f6710c8eb Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit ade59ea316dc17ff6c25fb10939a03008a70c11b)
* Fix crash on serializing default-constructed QTimeZoneEdward Welbourne2020-09-032-3/+40
| | | | | | | | | | | | | The serialization code neglected to check against null. Sinze zones are saved either by IANA ID or in our special OffsetFromUtc format, representing an invalid zone by a string that cannot possibly be a valid IANA ID will do. Fixes: QTBUG-86019 Change-Id: I6882026403d00f8b254aab34c645f1cf8f9fcc2d Reviewed-by: Taylor Braun-Jones <taylor@braun-jones.org> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> (cherry picked from commit 14f3f419b0864944d75283a850dc0ce141feaf0e)
* QBezier: Don't try calculating a unit vector when length is nullRobert Loehning2020-08-251-0/+2
| | | | | | | | | | It's undefined and causes a division by zero. Fixes: oss-fuzz-24273 Change-Id: I3d34d5c43cccff9255abaf87af265ddea3fe6d95 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit 7fa5fdae5c4f4c83acb74ff8cd65eacfa567a727) Reviewed-by: hjk <hjk@qt.io>
* xcb: Fix flushing of native subwindows when not using shared memoryTor Arne Vestbø2020-08-251-2/+11
| | | | | | | | | | | | | | | | | | | | | When using X-forwarding we're not using shared memory for the backing store image, and end up in a code path where we first copy the updated parts of the backing store from our client side image over to the server, and then flush those parts from the server-side image to the window. The problem was that this code path didn't account for the possibility that we'd flush a sub-window at an offset, and would end up uploading the sub-window local region directly, without applying the offset. This problem was revealed when 79bf1b7e348d started being smarter about what regions we flush and to what windows when we have sub windows. Fixes: QTBUG-81723 Change-Id: I1c9c8bc53c088cdc1ae8b892e17930f4a468ccad Reviewed-by: Gatis Paeglis <gatis.paeglis@qt.io> (cherry picked from commit 81e09ae404b632a92e1e4c27f5875bdf027c5401) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* qwsi: revert parts of 00ae1e6b7bf6efa5f5e57d37844e44d521604fb6Gatis Paeglis2020-08-243-26/+2
| | | | | | | | | | | | | | We actually do not need this "mode" in qwsi API. I think while writing the patch from 00ae1e6b7b I got confused by focusing on my test application. We can't know what the native event filter will filter out, therefore it makes sense that we unconditionally do filtering at qwsi level as well for user input vs other events in QWindowSystemInterface::sendWindowSystemEvents(). Change-Id: Idb23152a24bf3ba3b91804427a6e78f991969c29 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> (cherry picked from commit 7318328c2d658f6ca2e9443c6e3e3b0a179e9811) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QGuiApplication: fix handling of spontaneous events' modifiersNicolas Guichard2020-08-203-53/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | QtQuickTest synthetized events can have modifiers, but those modifiers were not accessible globally, from QGuiApplication::keyboardModifiers for instance. eg. calling QML's TestCase::mouseClick with modifiers triggering a call to QGuiApplication::keyboardModifiers did not give the expected result. QtTest synthesised events can also have modifiers and those were correctly handled by QApplication to set modifiers globally. This fix moves the handling code from QApplication::notify to QGuiApplicationPrivate::maybeSimulateModifiers and calls this function from QGuiApplication::notify too. The definite fix would be to do as suggested in the comment attached to the moved code: > Qt Test should not call qapp->notify(), but rather route the events > through the proper QPA interface. This is required to properly > generate all other events such as enter/leave etc. Change-Id: I734e5bbc82232b13828b1a1f82e06ee8eb695417 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> (cherry picked from commit 4b1ffab8ad95eda737fde015c243442a28de8e23) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Doc: Mention no_testcase_installs which can be used to prevent installAndy Shaw2020-08-202-0/+9
| | | | | | | | Change-Id: If8044a339cab754d427fd7626dd6813c7cc99e56 Fixes: QTBUG-85827 Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit e1971c60f1b878467a5f3956a0eebd96a69832ae) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Handle simulator platforms when parsing LC_BUILD_VERSION load commandTor Arne Vestbø2020-08-191-5/+26
| | | | | | | | Task-number: QTBUG-85764 Change-Id: Ie46bee0937908e2dfedfa3532394dde015abf891 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit 3911be61602695ed65e33e54bee38ee8bcd92539) Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* Resolve SDK and deployment target OS from load commandTor Arne Vestbø2020-08-191-7/+25
| | | | | | | Change-Id: Icce79186645f173b7f9be8ee6da0abed25cf3da0 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit 4e74bb48234f41c9d6306c7a3cd6835c2cd42348) Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* Android: Don't pause when in multi window modeAndy Shaw2020-08-191-1/+2
| | | | | | | | | | When the application is in multi window mode then when pausing it should not suspend the application as it can still be visible in the background. Change-Id: I03a561459b2aa04c808b7d4220cd3e558671dd17 Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> (cherry picked from commit 33c24b9b9d0c6ae1899cec2e01bad9df01ca05f6)
* QtPrivate::isLatin1: fix SSE2 non-SSE4.1 codeThiago Macieira2020-08-171-20/+1
| | | | | | | | | | | | | The implementation was broken. The "high" in PUNPCKHBW's "unpack high data" means the high 64-bit of the 128-bit, not the high byte of a 16- bit word. This never worked. It always passed for me because I don't build non-SSE4.2 code (too old, no longer relevant). So just use the working version of simdTestMask. Change-Id: I35a1b4d0a19a43149daefffd16284542f0de3fa3 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit 9422b5ebc3592f4687650a84131e736219308b9f)
* QByteArray::toDouble: fix buffer overflow reads on fromRawData()Thiago Macieira2020-08-171-6/+25
| | | | | | | | | | | | | If Qt was not compiled with libdouble-conversion, sscanf() requires null-termination, which fromRawData() does not require. This could be fixed by making QByteArray pass a reallocated copy if it is operating on raw data, but fixing qt_asciiToDouble() means we catch all cases and we optimize for the common case of not-horribly-long strings. Fixes: QTBUG-85580 Change-Id: Iea47e0f8fc8b40378df7fffd16246f6163b01442 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> (cherry picked from commit efd3c7bf2427c8237857e56ecd51b8da3ce43a6e)
* Allow smooth curve stroking for very wide linesEirik Aavitsland2020-08-121-1/+5
| | | | | | | | | | | | | | | The earlier limit set on the curve threshold turned out to be too strict, leading to visibly bad rendering in reasonable use cases. Ref. 5322998a0ba80b1e095340245ddb00aaf5947be9 As a drive-by, add a missing fixed-to-real conversion. (This is a no-op in a default build, where qfixed==qreal.) Fixes: QTBUG-85193 Change-Id: I7cc3543d7aa4e90643b275686372400879decef2 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> (cherry picked from commit 4db44bc32f9a08e89391aa3d99a01060a4f10737) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* macOS: Fix crash when re-using backingstore for re-created QWindowTor Arne Vestbø2020-08-071-0/+8
| | | | | | | | | | | | | | | | | | | The observer we add for the NSWindow of the backingstore window will not be valid once that window is destroyed, but we may get last minute notifications for it still, in which case our platform window is gone. This patch fixes the immediate crash, but reveals a more fundamental problem of assuming the platform window that's alive during construction is the one that will always be used with the backingstore. This is not the case when for example QtWidgets opens a combo box, and reuses the backingstore for the widget each time the combobox popup is shown. Fixes: QTBUG-85915 Change-Id: Ia66a45d003882602ac29476aabf2d58b0ac33c1e Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> (cherry picked from commit abb985a4032a337581aa885e1ac547287244b695) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Add QOperatingSystemVersion support for macOS Big SurTor Arne Vestbø2020-08-057-109/+146
| | | | | | | | Change-Id: Ide57f675b20b08210f301da5177df45d008423c4 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> (cherry picked from commit 19d32f0a5fc8b12e03a84ab6e18845337fd3b70f) Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* Teach QMacVersion to deal with 32-bit Mach-O headersTor Arne Vestbø2020-08-052-5/+3
| | | | | | | Change-Id: I7946aa35722bc76326e2d6cf0820353c4ba13fad Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> (cherry picked from commit b6de6a96990577f8041ba1520bd0f2766be6027c) Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* Fix buffer overflow in XBM parserAllan Sandfeld Jensen2020-08-042-1/+40
| | | | | | | | | | | | | | Avoid parsing over the buffer limit, or interpreting non-hex as hex. This still leaves parsing of lines longer than 300 chars unreliable Change-Id: I1c57a7e530c4380f6f9040b2ec729ccd7dc7a5fb Reviewed-by: Robert Loehning <robert.loehning@qt.io> Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io> (cherry picked from commit c562c1fc19629fb505acd0f6380604840b634211) Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Sanitize lengthValue in CSS parserRobert Loehning2020-07-311-5/+4
| | | | | | | | | | | Limit the LengthData to the integer range before rounding it, taking into account that qRound() substracts 1 from negative values. Fixes: oss-fuzz-23220 Change-Id: I1b4383f3c33aac22746831002b2c74fc134faf77 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> (cherry picked from commit 188501fe27899cdc6a1aacf0d8c1a11144bd564a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Check returns of hex2int in get_hex_rgbRobert Loehning2020-07-312-0/+5
| | | | | | | | | | | Avoids undefined behavior when trying to shift negative values. Fixes: oss-fuzz-21860 Fixes: oss-fuzz-23968 Change-Id: I879c97624e3f8ba9cf01e0a3a682379cd8c4a199 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit 3094bcc3c5a30635289f534884965d39ac35a11a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix buffer overflowRobert Loehning2020-07-313-1/+10
| | | | | | | | Fixes: oss-fuzz-23988 Change-Id: I4efdbfc3c0a96917c0c8224642896088ade99f35 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit e80be8a43da78b9544f12fbac47e92c7f1f64366) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Multiply instead of shiftingRobert Loehning2020-07-311-1/+1
| | | | | | | | | | The shift operator is undefined for negative values. Fixes: oss-fuzz-23735 Change-Id: Ib4bad0bf2135f9ddc95f6d7de64d935a02b4791e Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit fd0c9fcaccbbb284f00c3403152bd3faf5940888) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* sqlite: Upgrade to 3.32.3Andy Shaw2020-07-313-82/+255
| | | | | | | | | [ChangeLog][QtSQL][sqlite] Upgraded to v3.32.3 Change-Id: I3c00fb6b0bd7daa3465b38ac6536b82d0b16596f Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit 777d6a546d6c4d5985f37c38714462d32fbe5155) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-27 04:47:28 +0000