summaryrefslogtreecommitdiffstats
path: root/src/3rdparty
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-11-0611-2/+19
|\ | | | | | | Change-Id: Id1e4664d3c942226b76e2c3b338df3116ff89297
| * 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>
* | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-11-011-0/+4
|\| | | | | | | Change-Id: I6f8d3abd3247dc980dc7834801a017a89c8f4286
| * 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.12' into devLiang Qi2018-10-25910-89450/+192230
|\| | | | | | | | | | | | | | | | | Conflicts: src/corelib/animation/qpropertyanimation.cpp src/gui/image/qicon.cpp tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp Change-Id: I3698172b7b44ebb487cb38f50fd2c4a9f8a35b21
| * 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>
| * | Fix ANGLE build failure with mingwMiguel Costa2018-10-172-0/+489
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added the files libEGLd_mingw32.def and libGLESv2d_mingw32.def that were deleted by mistake in the recent ANGLE update, causing failure when building with mingw in debug. Fixes: QTBUG-71189 Change-Id: I0bf446c3f2d189afb806bbfed2fdc1a3f70750c1 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
| * | 3rdparty/xkbcommon: update bundled version 0.4.1 -> 0.8.2Gatis Paeglis2018-10-1757-3511/+6075
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0.8.2 + subsequent commits up to 31f1f355700870c6615399fbfa7934934b3a9a57. There were couple commits after 0.8.2. Mostly minor stuff, with 2 exceptions: fix off-by-one error in xkb_file_type_to_string() and undefined behavior in src/x11/keymap.c We currently don't use any of the features added in later releases of libxkbcommon, therefore the minimal required version in src/gui/configure.json remains the same. [ChangeLog][Third-Party Code] updated bundled libxkbcommon 0.4.1 -> 0.8.2 (up to 31f1f355700870c6615399fbfa7934934b3a9a57) Task-number: QTBUG-71109 Change-Id: Ia03c3dc31c5f39e78dcb5915a45e82797b065ccb Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| * | Merge remote-tracking branch 'origin/5.11' into 5.12Liang Qi2018-10-1727-1168/+1218
| |\| | | | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/platformthemes/platformthemes.pro src/printsupport/kernel/qplatformprintdevice.cpp Change-Id: Iac01729ad954bb1c7af5867d982eb243b2139ee6
| | * Update bundled libpng to version 1.6.35Eirik Aavitsland2018-10-1227-1168/+1218
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The remaining diff to clean 1.6.35 is archived in the qtpatches.diff file. [ChangeLog][Third-Party Code] libpng was updated to version 1.6.35 Change-Id: I925b3d95f6da20e12fc3274b4713e3fea05094f7 Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | Update bundled sqlite to 3.25.2Andy Shaw2018-10-163-7100/+14541
| | | | | | | | | | | | | | | | | | | | | [ChangeLog][Third-Party Code] Sqlite was updated to version 3.25.2 Change-Id: I2d74ee924745a5e1edd6fe511777965313a4b77a Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
| * | Fix attributions for wasm fontsKai Koehne2018-10-153-9/+209
| | | | | | | | | | | | | | | Change-Id: I83251f49f62f502ac2cc21048e9d4e079cee5e99 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
| * | Update ANGLE to chromium/3280Miguel Costa2018-10-13785-73604/+164815
| | | | | | | | | | | | | | | Change-Id: I0802c0d7486f772d361f87a544d6c5af937f4ca1 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-10-132-1/+2
|\| | | | | | | | | | | Change-Id: I2715ee7c694e5579bcedc7bab0ae68e79d5fd0b6
| * | doc: Document version of bundled Freetype in qt_attributionEskil Abrahamsen Blomfeldt2018-10-091-0/+2
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-70901 Change-Id: Ibc330320cf3851e9aed13a66a3552bd8b2ad34da Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | wasm: fix parse errorLorn Potter2018-10-081-1/+0
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-70952 Change-Id: I8a39de1d16b5301d221be4e9e47cabd4827b71aa Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-10-091-1/+1
|\| | | | | | | | | | | Change-Id: I5cbfd39cf728036bbdfdeec8e8739568e0a3025b
| * | Merge remote-tracking branch 'origin/5.11' into 5.12Qt Forward Merge Bot2018-10-081-1/+1
| |\| | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/tools/qtimezoneprivate.cpp Change-Id: Icbb5999d378711ce3786a4fe0aba176a45ac702c
| | * zlib: Fix spelling of licenseKai Koehne2018-10-021-1/+1
| | | | | | | | | | | | | | | | | | | | | Follow spelling convention at https://spdx.org/licenses/Zlib.html Change-Id: Ib25b98cf7f3a052ec25ba6924748a962733e2ed8 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | | SQLite: enable json1 extensionChristian Ehrlicher2018-10-031-1/+1
|/ / | | | | | | | | | | | | | | | | | | | | | | This patch enabled json1 support for sqlite3 by defining SQLITE_ENABLE_JSON1 [ChangeLog][QtSql][SQLite] Enable the json1-extension for the SQLite3 plugin Task-number: QTBUG-63498 Change-Id: Iaf1069ff1396c573125a5a3f490c0df5df560468 Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* | Update bundled libjpeg-turbo to version 2.0.0Eirik Aavitsland2018-09-2884-5267/+5794
| | | | | | | | | | | | | | | | | | | | | | New, manually created configuration files (jconfig.h / jconfigint.h) for building in Qt are now placed outside the src directory. [ChangeLog][Third-Party Code] libjpeg-turbo was updated to version 2.0.0 Done-with: André Klitzing <aklitzing@gmail.com> Change-Id: I77e34419ebe2f70038b9b80cdf13876055c2a35f Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into 5.12Liang Qi2018-09-271-0/+1
|\| | | | | | | | | | | | | | | Conflicts: src/corelib/global/qconfig-bootstrapped.h src/widgets/util/qcompleter.cpp Change-Id: I4f44f0f074982530f2f2e750ce696230b2754cf3
| * Document IAccessible2 versionKai Koehne2018-09-241-0/+1
| | | | | | | | | | | | | | | | The update to 1.3.0 was done in b2a7d865b2660d83fa899a213826525788d66b95. Change-Id: Ie4227d49a1ee0707abff754a5edbcb2b9663ccfe Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | Doc: Improve HarfBuzz configure options documentationPaul Wicking2018-09-272-2/+2
| | | | | | | | | | | | | | Task-number: QTBUG-63632 Change-Id: Iedaf34d016d13eeae3dc2e9030a3cea28e602ccc Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io> Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* | Upgrade double-conversion to v3.1.1Thomas Miller2018-09-2520-134/+365
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Utils.h now includes defines for _M_ARM and _M_ARM64 to enable compilation on Windows arm and arm64. The locally added __ghs and __EMSCRIPTEN__ clauses are preserved. [ChangeLog][Third-Party Code] double-conversion got updated to upstream version 3.1.1. Task-number: QTBUG-70008 Change-Id: Ie5411ee8d9cb32c39d7dca5a2262e6b3854732a5 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into 5.12Qt Forward Merge Bot2018-09-073-0/+42
|\| | | | | | | Change-Id: I66c7f18a2abd13601da0947919436f7da3549ae9
| * Document SLJIT part of pcre2Kai Koehne2018-09-062-0/+41
| | | | | | | | | | | | | | | | | | | | src/sljit features the BSD-2-Clause license, not the BSD-3-Clause one. [ChangeLog][Third-Party Components] Added documentation for the SLJIT part of pcre2, which is available under the BSD-2-Clause license. Change-Id: Ie1e981ef6eab2c8d2960919b66ac85b29450f919 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * Document version number of pixmanKai Koehne2018-08-311-0/+1
| | | | | | | | | | | | | | | | The files match the ones in pixman 0.17.12 Task-number: QTBUG-69276 Change-Id: Idd03c6979456ad2cf4dcc2aee6986ebc95140937 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* | Update TinyCBORThiago Macieira2018-09-012-59/+69
| | | | | | | | | | | | | | | | Updated to https://github.com/thiagomacieira/tinycbor commit 1286d99bdc664de6acf7c5274702325f5a095a0f Change-Id: I0d3cc366baaa49f3ad28fffd15428e886333bb38 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | WebAssembly for QtBaseMorten Johan Sørvig2018-08-305-1/+37
| | | | | | | | | | | | | | | | | | | | | | | | This is the squashed diff from wip/webassembly to dev. Done-with: Peng Wu <peng.wu@intopalo.com> Done-with: Sami Enne <sami.enne@intopalo.com> Done-with: Morten Johan Sørvig <morten.sorvig@qt.io> Started-by: Andrew Knight <andrew.knight@intopalo.com> Change-Id: I6562433c0a38d6ec49ab675e0f104f2665f3392d Reviewed-by: Lorn Potter <lorn.potter@gmail.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devLiang Qi2018-08-161-0/+1
|\| | | | | | | | | | | | | | | | | Conflicts: src/corelib/global/qconfig-bootstrapped.h src/plugins/platforms/xcb/qxcbbackingstore.cpp Done-with: Gatis Paeglis <gatis.paeglis@qt.io> Change-Id: I4af138ffb2f5306373244523768209e8873b2798
| * Document xkbcommon versionKai Koehne2018-08-151-0/+1
| | | | | | | | | | | | Task-number: QTBUG-69276 Change-Id: I0023ce210205def958b9e18f3d3c3a63576fc871 Reviewed-by: Gatis Paeglis <gatis.paeglis@qt.io>
* | Merge branch '5.11' into devEdward Welbourne2018-07-3136-3126/+4863
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: qmake/library/qmakebuiltins.cpp src/plugins/platforms/windows/qwindowstabletsupport.h src/plugins/platforms/xcb/qxcbconnection.cpp src/plugins/platforms/xcb/qxcbconnection.h src/plugins/platforms/xcb/qxcbconnection_xi2.cpp src/plugins/platforms/xcb/qxcbwindow.cpp src/widgets/styles/qstylesheetstyle.cpp tests/auto/widgets/styles/qstylesheetstyle/tst_qstylesheetstyle.cpp Done-With: Gatis Paeglis <gatis.paeglis@qt.io> Change-Id: I000b0eb3cea2a5c7a99b95732bfdd41507cf916e
| * PCRE2: upgrade to upstream version 10.31Giuseppe D'Angelo2018-07-2336-3126/+4863
| | | | | | | | | | | | | | | | [ChangeLog][Third-Party Code] PCRE2 was updated to version 10.31. Task-number: QTBUG-69271 Change-Id: I0be7c280029f781aa20add8f87868d59e3fa53da Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | Update TinyCBOR to 1b233087a6e6b6be297e69bfcce5ed36f338c91dThiago Macieira2018-07-185-23/+44
| | | | | | | | | | | | | | | | From the fork at https://github.com/thiagomacieira/tinycbor Change-Id: I117816bf0f5e469b8d34fffd153dc88683051208 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-07-174-3478/+5657
|\| | | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/platforms/cocoa/qcocoawindow.mm src/plugins/platforms/xcb/qxcbintegration.cpp Conflicts git missed: src/plugins/platforms/qnx/qqnxglcontext.cpp Change-Id: I0582cdc9e66e43efe79038b9c43d4f9572ac88fc
| * Update bundled sqlite to 3.24.0Kai Koehne2018-07-133-3471/+5652
| | | | | | | | | | | | | | | | [ChangeLog][Third-Party Code] Sqlite was updated to version 3.24.0 Task-number: QTBUG-69274 Change-Id: Icf3d7b2c1af0fb67033fd39240bee0cacccaf96f Reviewed-by: Andy Shaw <andy.shaw@qt.io>
| * Fix the copyright attribution for the HarfBuzz dependencyNicolas Ettlin2018-07-131-7/+5
| | | | | | | | | | | | Task-number: QTBUG-69260 Change-Id: I03079bee5eb17f87f48690e800517831f6215975 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devLiang Qi2018-07-021-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/platforms/cocoa/qnsview.mm src/plugins/platforms/cocoa/qnsview_dragging.mm src/plugins/platforms/ios/qiosinputcontext.mm src/plugins/platforms/xcb/qxcbconnection.cpp src/plugins/platforms/xcb/qxcbconnection_xi2.cpp src/plugins/platforms/xcb/qxcbwindow.cpp src/tools/androiddeployqt/main.cpp Was moved from qttools into qtbase in 5.11. So re-apply 32398e4d here. tests/auto/corelib/global/qlogging/test/test.pro tests/auto/corelib/global/qlogging/tst_qlogging.cpp tests/auto/corelib/io/qfile/tst_qfile.cpp tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp tests/auto/corelib/thread/qthreadstorage/test/test.pro tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp tests/auto/widgets/kernel/qapplication/test/test.pro Done-with: Gatis Paeglis <gatis.paeglis@qt.io> Done-with: Mårten Nordheim <marten.nordheim@qt.io> Done-with: Oliver Wolff <oliver.wolff@qt.io> Change-Id: Id970486c5315a1718c540f00deb2633533e8fc7b
| * [Backport] Remove usage of auto_ptr in MacroExpanderCorentin Wallez2018-06-211-1/+1
| | | | | | | | | | | | | | | | BUG=angleproject:1269 Task-number: QTBUG-68954 Change-Id: Ie4ebea85bc3721e79c7414dea62ca7a042b2421c Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devLiang Qi2018-06-071-40/+45
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf src/corelib/kernel/qeventdispatcher_cf.mm src/gui/kernel/qguiapplication_p.h src/gui/kernel/qwindowsysteminterface.cpp src/gui/kernel/qwindowsysteminterface.h src/plugins/platforms/cocoa/qcocoawindow.mm src/plugins/platforms/cocoa/qnswindowdelegate.mm src/plugins/platforms/ios/qioseventdispatcher.mm src/plugins/platforms/windows/qwindowsdrag.h src/plugins/platforms/windows/qwindowsinternalmimedata.h src/plugins/platforms/windows/qwindowsmime.cpp src/plugins/platforms/winrt/qwinrtscreen.cpp Change-Id: Ic817f265c2386e83839d2bb9ef7419cb29705246
| * forkfd: Restore errno on exit from the SIGCHLD handlerThiago Macieira2018-05-301-40/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I'd never thought about it, but it is a requirement: a signal handler must leave the global state as it found it (except for those bits that it intended to change, and those must be done in an async-signal-safe way). Otherwise, errno could change from one line to the next in the middle of some code. [ChangeLog][QtCore][QProcess] On Unix, the QProcess SIGCHLD handler now restores errno on exit. Task-number: QTBUG-68472 Change-Id: If025d476890745368955fffd1531e7126f1436d9 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* | QCborStreamReader: update to the new TinyCBOR zero-copy string APIThiago Macieira2018-06-065-66/+84
| | | | | | | | | | Change-Id: Iab119b62106d40fb8499fffd1510abe5d8f2722a Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* | Import TinyCBORThiago Macieira2018-05-2720-0/+6858
| | | | | | | | | | | | | | | | | | | | This does not match any upstream version, but rather the "dev" branch at https://github.com/thiagomacieira/tinycbor/. I've found myself completely out of time to finish developing the TinyCBOR buffer integration and zero-copy support. Change-Id: I9741f017961b410c910dfffd150133cbf6fbe678 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-05-051-1/+1
|\| | | | | | | Change-Id: Ib58433da04bffb5dfab5486b80f17f39cc4145fa
| * Fix encoding of freetype/LICENSE.txt to utf-8Kai Koehne2018-05-041-1/+1
| | | | | | | | | | | | | | The previous encoding was ISO-8859-1. Change-Id: Id13bf1936120fb8b3630ba671ca92f285fa80dec Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | Upgrade double-conversion to v3.0.0Ulf Hermann2018-05-0210-42/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes their issue #41, a potential undefined behavior. We preserve the locally added "__ghs" clause as well as the _M_ARM_FP clause necessary for winrt in utils.h. [ChangeLog][Third-Party Code] double-conversion got updated to upstream version 3.0.0. Task-number: QTBUG-66561 Change-Id: Id79125bdeeaebb61dca2e2885d3370accce9030c Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Detect C standard and try using the most recent one (take 2)Allan Sandfeld Jensen2018-04-211-1/+3
| | | | | | | | | | | | | | Fixes the default C version used with gcc < 5 Change-Id: I948dece961caed8e6b181e1c6e6b9dc43c46583e Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-04 08:59:27 +0000