summaryrefslogtreecommitdiffstats
path: root/src/3rdparty
Commit message (Collapse)AuthorAgeFilesLines
* Fix CVE-2020-9327 in SQLiteAndy Shaw2020-03-092-9/+225
| | | | | | | | | | This was taken from abc473fb8fb99900 in SQLite, ref: https://www.sqlite.org/cgi/src/info/abc473fb8fb99900 Fixes: QTBUG-82533 Change-Id: I9840e29f19a0b861229987f5b59d8585ba2e55dc Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> (cherry picked from commit 2c1b4e37b936f64d6b52e2bc10ff97184a714b9a)
* sqlite: Update to v3.31.1Andy Shaw2020-02-119-5724/+9005
| | | | | | | | | | | Since the patches applied previously are no longer required, we have removed those too. [ChangeLog][QtSQL][sqlite] Updated to v3.31.1 Change-Id: Ia80c31683a8cf92cfd114b6da32460ddcf38d502 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit eb45c37be7e32a20612b23f54a830ea0c4db7119)
* Fix CVE-2019-19880 in SQLiteAndy Shaw2020-01-242-0/+32
| | | | | | | Fixes: QTBUG-81565 Change-Id: I6bf2364e696315e5262d1abfa2f0b6947f14a33b Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit f59ef938ce384b80819bcea660cf8626ff1789e7)
* Fix CVE-2019-19646 in SQLiteAndy Shaw2020-01-212-1/+32
| | | | | | | Task-number: QTBUG-81020 Change-Id: I7176db20d4a44b1fb443a6108675f719e9643343 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit 3b697f496303bd005ae9d1d2c974efeed259d8a3)
* Fix CVE-2019-19645 in SQLiteAndy Shaw2020-01-132-1/+93
| | | | | | | Task-number: QTBUG-81020 Change-Id: I58b1dd9e7a90ba998c3af7f25a4627d8bdd70970 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit 1e89c132e1280276e1d3a82ec3464afec8c14c3a)
* Fix CVE-2019-19603 in SQLiteAndy Shaw2020-01-122-6/+121
| | | | | | | | | | | This includes the patch needed to fix this CVE and a supporting one to include a new function added that it depends on. Task-number: QTBUG-80903 Change-Id: Ic7639d50c89a3ee7d45426588c3ab0efd0eebb72 Reviewed-by: Christian Ehrlicher <ch.ehrlicher@gmx.de> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit a75d238b3194ae4973be7f6ce0508a526d4aa49e)
* Fix CVE-2019-19242 in SQLiteAndy Shaw2020-01-102-1/+37
| | | | | | | | Task-number: QTBUG-80903 Change-Id: I78a72a574da5cf3503950afe47146ae6424f00c6 Reviewed-by: Christian Ehrlicher <ch.ehrlicher@gmx.de> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit dcef0b96eef04c4e17c2e51ea71aea1f78625864)
* sqlite: Update to v3.30.1Andy Shaw2020-01-084-4009/+5304
| | | | | | | | | | | | Since the patch applied previously is no longer required, we have removed that too. [ChangeLog][QtSQL][sqlite] Updated to v3.30.1 Fixes: QTBUG-79416 Change-Id: Ifc3fcc6e1768f80e97a5e0ab4b2aeabddf2ced9d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> (cherry picked from commit 11acbc2c9928603dae6b4e2f1ca8b745e766f92b)
* Fix CVE-2019-19244 in SQLiteAndy Shaw2019-12-112-0/+27
| | | | | | | Fixes: QTBUG-80635 Change-Id: I718349e28ec76ea164dd50f2a985f2074dd6bdbd Reviewed-by: Jesus Fernandez <jsfdez@gmail.com> (cherry picked from commit a7108ec6cfb6411e40a4012f3e6d3b5d5fb9631d)
* Update bundled libjpeg-turbo to version 2.0.3Eirik Aavitsland2019-10-3015-78/+185
| | | | | | | | | | | | [ChangeLog][Third-Party Code] libjpeg-turbo was updated to version 2.0.3 Squashed cherry pick of: e14e8427faae670c662efede723edc2db4c875cb 97e78b0e1f0396cdee0319bafaf8ce1d6eb74f64 f3dbe98dca58731ff98dff3cc9111a8252f8e1e6 Change-Id: I9f9b8b3a913fd5843759c0610f43b22c5bee67dc Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Fix CVE-2019-16168 in SQLiteAndy Shaw2019-10-072-1/+46
| | | | | | | | | | | | v3.29.0 is the latest and there is no indication as to when the next release is so we will apply this separately for now and it can be reverted once it is in a release that we ship with. This patch is taken from https://www.sqlite.org/src/info/98357d8c1263920b Change-Id: I82d398b093b67842a4369e3220c01e7eea30763a Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> (cherry picked from commit c3faeb852866a2fc8ae9cd6f8cf91947bd42b538)
* sqlite: Update to v3.29.0Andy Shaw2019-10-073-3112/+4062
| | | | | | | | [ChangeLog][QtSQL][sqlite] Updated to v3.29.0 Change-Id: Ibf61c829dcd24dc8cdf00f5b57078255b0ad5ef1 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> (cherry picked from commit f88476569a8608d0f8257fcf3c426cbc68de6d7c)
* ANGLE: Invalidate client window area when resizing swap chainVal Doroshchuk2019-06-211-0/+4
| | | | | | | | | | | | | | | | | | | | Inspired by: https://codereview.appspot.com/6812076/ Resizing a window larger results in the newly exposed region being invalidated but the old region is treated as valid. This can result in the old region no longer updating. Was added to D3D9. Improving a fix from Filippo Cucchetto: https://codereview.qt-project.org/c/qt/qtbase/+/195336 and pushing to D3D11. ifndef protects against compilation error for WinRT. Invalidate() should be used only for desktop apps. Task-number: QTBUG-46074 Change-Id: Ie24b8dffe130b970f2362337ac4f9bee666f82b2 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Update SQLite to 3.28.0Andy Shaw2019-06-053-6004/+8409
| | | | | | | [ChangeLog][Third-Party Code] Updated bundled SQLite to version 3.28.0 Change-Id: I3561ec3bcf80fe6062ccab27f1008dfda66e1187 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* ANGLE: Decorate symbol names in MinGW .def filesOliver Wolff2019-06-034-948/+946
| | | | | | | | | In order to be able to link against the created ANGLE libraries, MinGW needs decorated symbol names inside the .def files. Task-number: QTBUG-76087 Change-Id: I090dbfb8fd468e2ea18de3785e2b694294f4b63a Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
* ANGLE: Backport fix for compilation on mingw/64bit with clangMartin Storsjö2019-05-081-1/+2
| | | | | | | | This backports the following upstream fix from angle: https://github.com/google/angle/commit/63cc351fbad06c6241d1c7372fe76f74e1d09a10 Change-Id: Id80dba62c69f3505eb836f758367b4bf054b1fd5 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Upgrade PCRE2 to 10.33Giuseppe D'Angelo2019-05-0235-4462/+7208
| | | | | | | Adjust also the attribution file. Change-Id: I27bdbcf07bdca51bb5ae169ca50dd63502f5468f Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Update bundled libpng to version 1.6.37Eirik Aavitsland2019-04-2916-145/+133
| | | | | | | | | The remaining diff to clean 1.6.37 is archived in the qtpatches.diff file. [ChangeLog][Third-Party Code] libpng was updated to version 1.6.37 Change-Id: I589bff09beec1977be8c6ca2a60aadf05f337f38 Reviewed-by: Liang Qi <liang.qi@qt.io>
* TinyCBOR: Fix parsing on big-endian machinesThiago Macieira2019-04-251-3/+6
| | | | | | | Original commit from https://github.com/thiagomacieira/tinycbor/pull/1 Change-Id: I194d3f37471a49788a7bfffd1594ef5db19465fd Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* ANGLE: clean up displays on dll unloadOliver Wolff2019-04-163-0/+20
| | | | | | | | | | If the displays are not cleaned up on dll unloading, profilers might report memory leaks. Change-Id: I04cbc3c2448bfb450f7d840e216827f86856e963 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Andre de la Rocha <andre.rocha@qt.io> Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* Update TinyCBOR with bugfixesThiago Macieira2019-04-087-113/+457
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated to https://github.com/thiagomacieira/tinycbor commit ac9369d8ec8511bc7516266ae6b07f7da860c954. Fabrice Fontaine (1): fix undefined encode_half in json2cbor Pedro Oliveira (1): Fixed minor error in the example code. Svyatoslav Phirsov (2): Typo fixed in stdlib fread(...) usage typo in dumprecursive return type Thiago Macieira (9): Install the tinycbor-version.h header. Update version number for a possible but unlikely 0.5.3 release Fix #137: off-by-one error in UTF-8 decoding Update Travis CI to Ubuntu Xenial Pretty: fix use of uninitialised variable Validation: fix out-of-bounds access when content ends in a string Parser: apply the same memory-check update Tests: remove useless comment Tests: Catch an earlier QCOMPARE failure in compare() phirsov (6): Fix off-by-one causing buffer overflow in open_memstream Protect macro argument expansion using parentheses eliminating misleading messages in case .config file not yet created Run check silently in Travis Make AppVeyor test suit run silent as in Travis enhancement #149 implemented: access half-precision floating point data as single float Change-Id: I9e3d261ad9bf41cfb2b6fffd159088f1cc9b3b02 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* Doc: Improve WinTab license informationKai Koehne2019-03-292-3/+5
| | | | | | | | | | | | | | | | | | | | Do not categorize the license anymore as 'Public Domain', because the actual text is not explicit on whether it allows modifications. Instead show the original license text. Also remove the Homepage link, which now just displays (arguably outdated) information about patents. Finally, do not misuse the "Version" field for metadata information, use the newly introduced "PackageComment" field instead. [ChangeLog][Third-Party Code] Changed classification of the wintab license from Public Domain to Custom. Fixes: QTBUG-74453 Change-Id: Ibae36be1deee3b9c498c45d03ed741c3d5ff630c Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Revert "Fix compilation with icc, converting between egl's and gl's Error types"Oliver Wolff2019-03-204-11/+6
| | | | | | | | | | | | | The patch causes an Assert on close and thus cannot be used as is. I do not have ICC available to try to come up with an alternative solution so the patch is reverted for the time being. This reverts commit 93a78799c3df7c8859b2d9addad45bb4a535dc97. Fixes: QTBUG-74467 Change-Id: Ic572dfa667a479686675eb3f9066d133657b4499 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Yuhang Zhao <2546789017@qq.com>
* Merge 5.12 into 5.12.2Kari Oikarinen2019-02-201-0/+1
|\ | | | | | | Change-Id: I3a5721aebd3afd8fa08d3f3df6bf61502fa9c347
| * wasm: fix building examples and applicationsLorn Potter2019-02-151-0/+1
| | | | | | | | | | | | | | | | | | This fixes a bug where app build would fail with AssertionError: SIMD is used, but not supported in WASM mode yet Change-Id: I27d5eb00b2c869b890dc519a7a793b7f87aeb9d2 Fixes: QTBUG-73795 Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
* | Fix compilation with icc, converting between egl's and gl's Error typesYuhang Zhao2019-02-184-6/+11
|/ | | | | | | | | | | | | | Each has two constructors from the other, one copying the other moving; and this leads to an ambiguous overload when converting Texture::onDestroy()'s gl::error to the egl::Error that gl::Context::onDestroy() returns. Passing the value through a temporary prevents the move-constructor from being attempted and saves the day. Thanks to Ville Voutilainen for suggesting the fix. Fixes: QTBUG-73698 Change-Id: I628173399a73cee2e253201bc3e8d3e6477a2fbf Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* harbuzzng: Remove assumption about Core Text working in 96 DPITor Arne Vestbø2019-02-111-21/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Core Text doesn't actually have a concept of DPI internally, as it doesn't rasterize anything by itself, it just generates vector paths that get passed along to Core Graphics. In practice this means Core Text operates in the classical macOS logical DPI of 72, with one typographic point corresponding to one point in the Core Graphics coordinate system, which for a normal bitmap context then corresponds to one pixel -- or two pixels for a "retina" context with a 2x scale transform. Scaling the font point sizes given to HarfBuzz to an assumed DPI of 96 is problematic with this in mind, as fonts with optical features such as 'trak' tables for tracking, or color glyphs, will then base the metrics off of the wrong point size compared to what the client asked for. This in turn causes mismatches between the metrics of the shaped text and the actual rasterization, which doesn't include the 72 to 96 DPI scaling. If a 96 DPI is needed, such as on the Web, the scaling should be done outside of HarfBuzz, allowing the client to keep the DPI of the shaping in sync with the rasterization. The recommended way to do that is by scaling the font point size, not by applying a transform to the target Core Graphics context, to let Core Text choose the right optical features of the target point size, as described in WWDC 2015 session 804: https://developer.apple.com/videos/play/wwdc2015/804/ GitHub-PR: https://github.com/harfbuzz/harfbuzz/pull/1484 Change-Id: I830f0cd7a82552422bbe09226e2d571e246fe3f4 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Update bundled Freetype to 2.9.1Eskil Abrahamsen Blomfeldt2019-01-31538-13625/+45323
| | | | | | | | | | | | This is required to support the new emoji font on Android 9. [ChangeLog][Freetype] Upgraded bundled Freetype version to 2.9.1. This also adds support for the latest emoji font in use on Android 9. Fixes: QTBUG-70657 Change-Id: I99be72f0d23c20aca122b8fdadd4ded87b2edce1 Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
* Merge remote-tracking branch 'origin/5.12.1' into 5.12Qt Forward Merge Bot2019-01-235-664/+2155
|\ | | | | | | Change-Id: Icebd151eae0cf9d400319a42573290d1a911ce26
| * Fix build with -no-libpng on WindowsJoerg Bornemann2019-01-111-2/+5
| | | | | | | | | | | | | | | | Check for availability of libpng in our bundled libfreetype. Fixes: QTBUG-71395 Change-Id: I99664b8583011f517b18e1038e327c6cb6799af7 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
| * Fix attribution file for "FreeBSD strtoll and strtoull"Kai Koehne2019-01-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The JSON file format does not support an "Upstream" entry, see also https://quips-qt-io.herokuapp.com/quip-0007.html Finally, the link didn't work for me. This amends ceeecbae510af6e Change-Id: I707f1113c399d85c2fbf982726033ac74f691915 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * Merge remote-tracking branch 'origin/5.12' into 5.12.1Liang Qi2019-01-084-15/+52
| |\ | | | | | | | | | | | | | | | | | | Conflicts: src/widgets/kernel/qtooltip.cpp Change-Id: Ic2f9a425359050eb56b3a4e5162cf5e3447058c8
| * | Update SQLite to 3.26.0Kai Koehne2018-12-183-661/+2149
| | | | | | | | | | | | | | | | | | | | | | | | | | | [ChangeLog][Third-Party Code] Updated bundled SQLite to version 3.26.0. Fixes: QTBUG-72631 Change-Id: Icbb1e2e247076d4ec1cea809f2940485c26c64ad Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | | Update bundled libpng to version 1.6.36André Klitzing2019-01-1628-639/+634
| |/ |/| | | | | | | | | | | | | | | | | The remaining diff to clean 1.6.36 is archived in the qtpatches.diff file. [ChangeLog][Third-Party Code] libpng was updated to version 1.6.36 Change-Id: Ia9d20c5abca115d509ed0aaf9eebfc85a88bef1d Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* | configure: properly atomize render vs. renderutilGatis Paeglis2019-01-033-15/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | xcb-render is a C interface for X11 extension. xcb-render-util is a utility library that complements xcb-render by providing convenience functions and interfaces which make the raw X protocol more usable. Bumped xcb-render-util version to avoid having include hacks. We were bundling 8 years old release 0.3.8 (Apr, 2011). 0.3.9 is the latest release and it was relesed 4,5 years ago (Jun, 2014). All CI machines have 0.3.9. The only thing that have changed in xcb-render-util sources since 2011 is that we don't need to have various hacks to include xcb_renderutil.h in C++ files. Upgrading bundled XCB libs was also requested in QTBUG-71109. Task-number: QTBUG-71109 Change-Id: Ib261f7584ad81be95660123b007e2200a3042f4c Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
* | ANGLE: Dynamically load D3D compiler from a listOliver Wolff2018-12-111-0/+25
|/ | | | | | | | | | | | If the default compiler cannot be found, load it from a list of DLL names, including a non-versioned proxy DLL provided by Qt. On Desktop Windows, the default compiler can also be specified by an environment variable, QT_D3DCOMPILER_DLL. Change-Id: I590bb11e58339451d187860c449b0209c1ca0578 Reviewed-by: Dmitry Kazakov <dimula73@gmail.com> Reviewed-by: Andre de la Rocha <andre.rocha@qt.io> Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
* ANGLE: Set ANGLE_COMMIT_HASH and ANGLE_COMMIT_DATEOliver Wolff2018-12-071-2/+2
| | | | | | Fixes: QTBUG-72371 Change-Id: Ia03447b77d4f88eefc760e9bee14dbf3dd79d5a5 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* src/3rdparty: remove xkbcommonGatis Paeglis2018-11-3070-37291/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The only reason why we bundled this library ~6 years ago was because it was not available on distributions that we supported at the time, but library was a hard dependency for XCB plugin. See: 2122e731abdb619249df89642c0800640b2fa428 Later more and more projects started to depend on it (compose input context plugin, libinput, mir, wayland). The configuration had become too complex, because some projects used bundled and some used the version from the system. Having libxkbcommon in 3rdparty sources is not necessary anymore, after RHEL 6.6 was removed from the list of supported platforms for Qt 5.12. Ubuntu 16.04 - 0.5.0 Ubuntu 18.04 - 0.8.0 openSUSE 42.3 - 0.6.1 RHEL-7.4 - 0.7.1 This will also simplify further development, e.g. QTBUG-42181 Bumped the minimal required version 0.4.1 -> 0.5.0. The patch also contains a code marked with "TRANSITION HACK", which is temporary needed so we can update the dependent wayland module. [ChangeLog][Third-Party Code] Removed xkbcommon from bundled sources. This library is present on all supported platforms. The minimal required version now is 0.5.0. Task-number: QTBUG-65503 Change-Id: Iec50829bb6f8fbb19f3c4e4ad62e332beb837de5 Reviewed-by: Lars Knoll <lars.knoll@qt.io> Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* Merge remote-tracking branch 'origin/5.12.0' into 5.12Liang Qi2018-11-1610-46/+122
|\ | | | | | | Change-Id: Ic1dd39044e19f50e1068d4ac70dacaad6440e570
| * Update DejaVuSans.ttf from upstreamEdward Welbourne2018-11-062-2/+3
| | | | | | | | | | | | | | | | | | Document the version in the process; and make the wordings of copyright notices match those in DEJAVU-LICENSE. Task-number: QTBUG-70008 Change-Id: I1c965e5d7afb18dc4dbdffed908512c5771ab717 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| * Update sha3's brg_endian.h, document provenance and versionEdward Welbourne2018-11-064-42/+68
| | | | | | | | | | | | | | | | | | | | | | The existing copyright notice gave me a name; github found me a file; but it doesn't match what we had before. Made some guesses at which parts of the change relative to upstream to keep, documented the diff as a patch and recorded details in qt_attribution.json Task-number: QTBUG-70008 Change-Id: I423724435eaeeda7237f8b3df8691b436fed8652 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| * fix configure instructions in libpng and libjpeg attributionsOswald Buddenhagen2018-11-062-2/+2
| | | | | | | | | | | | Fixes: QTBUG-71379 Change-Id: Ib1efbe0fc4407ccf6ab814229dc4a08d9d03b6b5 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| * Re-add missing ANGLE license filesTopi Reinio2018-11-062-0/+49
| | | | | | | | | | | | | | | | | | | | Commit 0a7aebad inadvertently removed two ANGLE-related files for license information. This caused the licensing documentation to fail to generate for those components. Task-number: QTBUG-71502 Change-Id: I33ee673267c43474304d577e78fc1a0c3bd8691f Reviewed-by: Martin Smith <martin.smith@qt.io>
* | Document provenance and version of sha3_keccakEdward Welbourne2018-11-111-0/+2
| | | | | | | | | | | | Task-number: QTBUG-71327 Change-Id: Iccfda0320d61e60df53ba30c12b4ffd0fc60d1ef Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | Add Windows Desktop arm64 target to QtbaseThomas Miller2018-11-112-5/+5
| | | | | | | | | | | | | | | | | | Allows a qt build to be configured to target arm64 desktop apps cross platform and build them with nmake. Change-Id: I99fed12047b45a504a1644201bcc19b18c69f3e6 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | Fix build with -qt-libpng on powerpcAllan Sandfeld Jensen2018-11-021-1/+1
| | | | | | | | | | | | | | | | | | It appears we are missing some setups for SIMD optimization, and already have a workaround for that for NEON, so do the same for VSX. Fixes: QTBUG-66388 Change-Id: I1cc1d0fe9c5a9df97acb589d29dec4dceb8fc576 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* | Update various qt_attribution.json filesEdward Welbourne2018-11-0210-1/+18
|/ | | | | | | | | | | | | Marking various as final because no upstream is known or available. Listing versions of others, where I was able to discover them. Updated a stale link (that helpfully redirected). Task-number: QTBUG-70008 Change-Id: Id00f34827133c560735c68793b4f1353f2b2ca85 Reviewed-by: Tobias Koenig <tobias.koenig@kdab.com> Reviewed-by: Lars Knoll <lars.knoll@qt.io> Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* angle: Add additional information to qt_attribution.jsonOliver Wolff2018-10-251-0/+4
| | | | | | | Task-number: QTBUG-71112 Change-Id: If1b81589f295657597a9dfa3671128a927cbe488 Reviewed-by: Andre de la Rocha <andre.rocha@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* Merge remote-tracking branch 'origin/5.11' into 5.12Qt Forward Merge Bot2018-10-2135-4067/+4892
|\ | | | | | | Change-Id: Iaf28977e7ecf566b28b9406dcb005d48621169c2
| * Upgrade PCRE2 to 10.32Giuseppe D'Angelo2018-10-1835-4067/+4892
| | | | | | | | | | | | | | [ChangeLog][Third-Party Code] PCRE2 was updated to version 10.32. Change-Id: Id3bf7df0003f626cd1135d0508a5a489ff02f1e5 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>