summaryrefslogtreecommitdiffstats
path: root/src/3rdparty
Commit message (Collapse)AuthorAgeFilesLines
* PCRE2: remove a source file from the .proGiuseppe D'Angelo2017-09-011-1/+0
| | | | | | | | | | pcre2_printint.c does not need to be compliled as a standalone source file, as it's #included from pcre2_compile.c. Apparently qmake does not detect this in all cases, and sometimes tries to compile pcre2_printint.c, resulting in compile errors. Change-Id: If494e5853b52ff1387bfb24f3847b73edcc837b7 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Update bundled libpng to version 1.6.32André Klitzing2017-08-2625-245/+1212
| | | | | | | | | | Also add import script. The remaining diff to clean 1.6.32 is archived in the qtpatches.diff file. [ChangeLog][Third-Party Code] libpng was updated to version 1.6.32 Change-Id: I1b4b78e39a6eb098d1b66c2528e47544bd9e6713 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Bump minimum glibc requirement for sys/eventfd.h to glibc 2.8Thiago Macieira2017-08-041-2/+4
| | | | | | | | | | | | | | | The file was added to glibc 2.7 along with the functions we need (Added 2007-10-05). But they forgot to install the file until a month and a half later (2007-11-17), which means it missed the 2.7 release (2007-10-19). Note that EFD_CLOEXEC wasn't added until glibc 2.9, so effectively glibc 2.9 is required. Change-Id: I3868166e5efc45538544fffd14d773ba576fb793 Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: David Faure <david.faure@kdab.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* Update bundled zlib to version 1.2.11André Klitzing2017-08-0452-7525/+3899
| | | | | | | | | | | Also clean up some unused files. The remaining diff to clean 1.2.11 is archived in the qtpatches.diff file. [ChangeLog][Third-Party Code] zlib was updated to version 1.2.11. Task-number: QTBUG-31020 Change-Id: I89f890904af48c6e9ba6eabc5d58f5adbe2c53f0 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* ANGLE: Fix build for newer MinGW versionsOliver Wolff2017-08-021-1/+1
| | | | | | | | | | | Availability of D3D11_QUERY_DATA_TIMESTAMP_DISJOINT depends on the used MinGW version so that the check for MINGW is not sufficient. The newly added configure test can be used for every toolset. Task-number: QTBUG-57916 Change-Id: Ia9cb48f3e673841101a93cbc8ea23aff9547f639 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* iaccessible2.pri: Fix architecture detectionFriedemann Kleint2017-07-111-5/+1
| | | | | | | | Use QT_ARCH instead of legacy QMAKE_TARGET.arch, which is not defined for MinGW. Change-Id: I5a1298321f696cf1bc30613283174ecfa0139600 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* ANGLE: Fix flickering on resize when D3D9 is usedOliver Wolff2017-07-032-0/+91
| | | | | | | | | | | By reverting ANGLE change d3b84ab51db09de238459b0dff2e8420c09aabf3 we get rid of the flickering that happens on resize when D3D9 is used. The issue that was fixed there is not relevant in Qt's context so it is safe to revert the change. Task-number: QTBUG-59893 Change-Id: I9306314b892612fbd1f7a058a2e606aedc0367bb Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Remove remains of wince in .pro filesFriedemann Kleint2017-07-032-7/+0
| | | | | | | | Task-number: QTBUG-52590 Change-Id: I444fc9eedc8a8e4ad2ede224d66e7c410bedbb48 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* actually make use of the detected ICUOswald Buddenhagen2017-07-021-13/+0
| | | | | | Task-number: QTBUG-58012 Change-Id: I7a3d99277daa6566811b24111205548b89e77c53 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Convert features.tabletevent to QT_CONFIGStephan Binner2017-06-281-1/+1
| | | | | Change-Id: Ibd7ed7f269a64afddadee70979b20f1c58398378 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* ANGLE: Fix crash with ltcg on Visual Studio 2015 Update 3Oliver Wolff2017-06-133-11/+11
| | | | | | | | | | | | | Release builds of applications that used Qt configured with "link time code generation" crashed (memory access violation), when calling GetInternalFormatInfo in Context::initCaps. It looks like this is a compiler problem that can be avoided by not using a reference for the return value. Task-number: QTBUG-55718 Change-Id: Ic1fb95d7b518a49859f41c819e860864387a8d3c Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Use upstream at-spi 2Frederik Gladhorn2017-06-098-1963/+0
| | | | | | | | | | Move at-spi dbus xml definitions into platformsupport, these files simply describe the DBus protocol and should not be in 3rdparty. The header files can just as well be picked up by pkg-config. Change-Id: I326d9b3cb69223bf2c8646099f211d9a9f3fa0af Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Update bundled sqlite to 3.16.2 as it fix some small regressionsAndré Klitzing2017-05-233-67/+120
| | | | | | | | | [ChangeLog][Third-Party Code] Sqlite was updated to version 3.16.2. Change-Id: Ib3e9c3a7021760e3cfa6dbd44f67b9da4abbe367 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* gradle: Complete qt_attribution.json fileKai Koehne2017-04-241-0/+2
| | | | | | | | Add it to the qtcore documentation, but mark it as a tool (code does not get shipped with customer application). Change-Id: I75cc199a2bbd86f9e40a75396144645ea69a7bd1 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* Update attribution file for changed command line paramHeiko Becker2017-04-071-1/+1
| | | | | | | | | 47c4d1378cc1eaffbc19c753726b36d2ff0decc0 changed the configuration command line parameter back to pcre, omitting the "2" which has been added after porting to PCRE2. Change-Id: Iadbd57725ab706cb4bae89c2decf8259bcad46b5 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* Merge remote-tracking branch 'origin/5.8' into 5.9Liang Qi2017-03-277-0/+1263
|\ | | | | | | Change-Id: Icdd71e9713725bda9c305e338f5c8b41a92ed8e8
| * Add gradle wrapper to Qt & update default Andriod gradle pluginBogDan Vatra2017-03-237-0/+1263
| | | | | | | | | | | | | | | | | | We need to add gradle wrapper to Qt because it was removed from latest Android SDK. Adding it to Qt, will give us more control and will save us from pain in the future. Task-number: QTBUG-59237 Change-Id: I6419876f8be11c0feeac448b228a46f811065264 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* | Merge remote-tracking branch 'origin/5.8' into 5.9Liang Qi2017-03-131-11/+17
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/network/network.pro mkspecs/features/mac/default_post.prf src/corelib/io/qfilesystemengine_win.cpp src/corelib/io/qprocess.cpp src/corelib/io/qprocess.h src/corelib/io/qprocess_p.h src/corelib/io/qprocess_unix.cpp src/corelib/io/qprocess_win.cpp src/corelib/thread/qmutex.cpp src/platformsupport/fontdatabases/windows/windows.pri src/plugins/platforms/eglfs/eglfsdeviceintegration.pro tests/auto/corelib/io/io.pro Change-Id: I8a27e0e141454818bba9c433200a4e84a88d147e
| * forkfd: fix calling the old signal handler when there wasn't oneThiago Macieira2017-03-061-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | On some stupid systems, execve() may clear the handler but not clear the SA_SIGINFO flag. This change now requires that sa_handler and sa_sigaction be in a union together. We can't operate otherwise. Task-number: QTBUG-59246 Change-Id: I33850dcdb2ce4a47878efffd14a84b48a8f6b1e8 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * forkfd: use SA_SIGINFO to pass extra information to chained handlersThiago Macieira2017-02-261-11/+15
| | | | | | | | | | | | | | | | | | | | This existed in QProcess before forkfd, but was lost in the port to it (commit 1814142b7a11befab315bf3f9d91c4ffbf56ef3e). The original QProcess fix was done in 97279d05822a70da1fb3dab083d823a5f5a008fe. Task-number: QTBUG-57584 Change-Id: Ibc5c715fda334a75bd2efffd14a425871f3162b5 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* | pcre2: Replace LGPL21 with LGPL license headerKai Koehne2017-02-281-13/+19
| | | | | | | | | | | | | | | | Also use canonical contact url. Change-Id: I61bf0990698a7021f1240deaf3eef2aff8f90a7e Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | Enable FTS5, will be used by Assistant instead of cluceneJarek Kobus2017-02-231-1/+1
| | | | | | | | | | Change-Id: Ifd1d7128c6080650b5ad43f87410c7058d8c5a74 Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
* | Merge remote-tracking branch 'origin/5.8' into 5.9Liang Qi2017-02-0829-1422/+2495
|\| | | | | | | | | | | | | | | Conflicts: configure.json mkspecs/win32-icc/qmake.conf Change-Id: Ibf40546b024d644c7d9ed490bee15b82597f4d3f
| * Fix libs build with msvc on Chinese locale on WindowsLiang Qi2017-02-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Chinese locale means Code Page 936 here. It's also related with removing C4819 warnings. And it's also following Conventions in Qt source code: All code is ascii only (7-bit characters only, run man ascii if unsure) See also http://wiki.qt.io/Coding_Conventions Task-number: QTBUG-56155 Task-number: QTBUG-58161 Change-Id: I37fa7a0e6a82a16eaf80e1cc99be801099ab87de Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: jian liang <jianliang79@gmail.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * Update bundled libpng to version 1.6.28André Klitzing2017-01-3128-1421/+2494
| | | | | | | | | | | | | | | | | | | | | | | | | | Merged in the upstream version. The remaining diff to clean 1.6.28 is archived in the qtpatches.diff file. This fixes CVE-2016-10087 but Qt was never vulnerable to that issue! [ChangeLog][Third-Party Code] libpng was updated to version 1.6.28. Change-Id: I46712103fb160f31702eb7496fdd5c492a59ba5b Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io> Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* | Document harfbuzz-ng upstream versionKai Koehne2017-02-031-0/+1
| | | | | | | | | | | | | | | | | | Document version updated in commit f4ac14944daa5778aa3cdb37113fbc5c774b40bf as 1.4.1. Change-Id: Ia890158d2e9b5d5dccea9a56342d0261dd0210cb Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
* | Update bundled HarfBuzz-NG copy to 1.4.1Konstantin Ritt2017-02-0293-4012/+8920
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Most important changes since 1.0: - New API. - Update to Unicode 9.0.0; add 6 more scripts. - Improved list of language tag mappings. - OpenType 1.8 Font Variations support. - Blacklist GDEF table of certain fonts. - Implement parsing of OpenType MATH table. - Implement CBDT/CBLC color font glyph extents. - Fix mark zeroing types of most shapers. - Allow GPOS cursive connection on marks, and fix the interaction with mark attachment. - Universal Shaping Engine fixes; update to latest draft from Microsoft. - Implement "shaping" of various Unicode space characters, even if the font does not support them. - Allow MultipleSubst to delete a glyph (matching Windows engine). - CoreText backend fixes and optimizations. - Optimizations and other improvements. [ChangeLog] Bundled HarfBuzz-NG copy updated to 1.4.1 Change-Id: Ie398fad8f6d3b98e3236f62a97caedc649511470 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* | Document new PCRE2 libraryKai Koehne2017-02-011-0/+17
| | | | | | | | | | | | | | | | [ChangeLog][Third-Party Code] The PCRE sources that are bundled with Qt got updated to version 10.22. Change-Id: Ib334fb4e9766035fd120ef4ab3a249322adba8eb Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
* | Merge "Merge remote-tracking branch 'origin/5.8' into dev" into refs/staging/devLiang Qi2017-01-261-0/+1
|\ \
| * | Merge remote-tracking branch 'origin/5.8' into devLiang Qi2017-01-251-0/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf mkspecs/common/msvc-desktop.conf mkspecs/common/msvc-version.conf mkspecs/common/winrt_winphone/qmake.conf mkspecs/features/mac/default_post.prf mkspecs/features/mac/sdk.prf mkspecs/features/qt.prf mkspecs/features/uikit/default_post.prf mkspecs/features/winrt/default_pre.prf mkspecs/winphone-arm-msvc2013/qmake.conf mkspecs/winphone-x86-msvc2013/qmake.conf mkspecs/winrt-arm-msvc2013/qmake.conf mkspecs/winrt-x64-msvc2013/qmake.conf mkspecs/winrt-x86-msvc2013/qmake.conf qmake/generators/win32/msvc_vcproj.cpp src/gui/kernel/qwindowsysteminterface.cpp src/network/kernel/qhostaddress.cpp src/plugins/platforms/mirclient/qmirclientplugin.cpp src/plugins/platforms/mirclient/qmirclientplugin.h src/widgets/util/qsystemtrayicon.cpp tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp tools/configure/Makefile.mingw tools/configure/Makefile.win32 Done-with: Jake Petroules <jake.petroules@qt.io> Done-with: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Change-Id: I4be3262d3994e11929d3b1ded2c3379783797dbe
| | * fix parallel builds with -qt-freetype -system-libpngOswald Buddenhagen2017-01-191-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | freetype has no dependency on gui, so it needs to pull in gui's configuration manually, as that's where the system libpng is found. Task-number: QTBUG-58038 Change-Id: I881495f7d2a8f7c1a45d7d4c9e7698ff1d30f2a9 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Joni Poikelin <joni.poikelin@qt.io>
* | | Enable gamma-correction on a face-by-face basisAllan Sandfeld Jensen2017-01-241-0/+1
|/ / | | | | | | | | | | | | | | | | | | | | Changes how we control if gamma-correction is done, and enables it for the freetype CFF engine when stem-darkening is available. The new code replaces existing hacks to force gamma-correction off when using Freetype on X11 and Windows. Change-Id: Ic703ca6965a3d81b204349e10f406c991b292edd Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* | Remove support for WinRT 8.1 and Windows Phone 8.1Maurice Kalinowski2017-01-181-1/+0
| | | | | | | | | | | | | | | | [ChangeLog][QtBase][General] Removed support for WinRT/Windows Phone 8.1. Task-number: QTBUG-57288 Change-Id: Ifd6d6780cbbdb710d99556ba3d2fb2e514d4f789 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | update bundled sqlite to 3.16.1André Klitzing2017-01-043-9824/+24047
| | | | | | | | | | | | | | | | [ChangeLog][Third-Party Code] Sqlite was updated to version 3.16.1. Change-Id: I9a19fcb6bbc95991ecf4699f2f7acf4b904eb4af Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Mark Brand <mabrand@mabrand.nl>
* | Merge remote-tracking branch 'origin/5.8' into devLiang Qi2016-12-135-12/+11
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure qmake/Makefile.unix.macos qmake/Makefile.unix.win32 qmake/generators/win32/msvc_vcproj.cpp src/3rdparty/pcre/qt_attribution.json src/corelib/io/qsettings.cpp src/corelib/kernel/qdeadlinetimer.cpp src/platformsupport/kmsconvenience/qkmsdevice.cpp src/platformsupport/kmsconvenience/qkmsdevice_p.h src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmscreen.cpp src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/qeglfskmsegldeviceintegration.cpp src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/qeglfskmsegldevicescreen.cpp src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/qeglfskmsdevice.cpp src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/qeglfskmsscreen.h tests/manual/qstorageinfo/printvolumes.cpp tools/configure/configureapp.cpp Change-Id: Ibaabcc8e965c44926f9fb018466e8b132b8df49e
| * List ANGLE contributions after anotherKai Koehne2016-11-231-4/+4
| | | | | | | | | | | | | | | | Place ANGLE at the start of the title, so that the different entries are sorted correctly. Change-Id: I11e9d25874f06450a3d9049b5f5c94aa53621e08 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
| * Improve documentation for 3rdparty freebsd codeKai Koehne2016-11-231-7/+3
| | | | | | | | | | Change-Id: Iad5c659c2c422bf20e7ba6161889c7b261512e9e Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
| * Fix forkfd 3rd party documenationKai Koehne2016-11-232-1/+2
| | | | | | | | | | | | | | | | | | | | Bring the copyright lines in the license and the one's in the metadata into line by using the ones from forkfd.c. Also bring back description of forkfd from 5.6 documentation. Change-Id: I423ee8d5d1e1c866a34c346f78520d33ea099b5e Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
| * Extend documentation for SHA-3 third-party licenseKai Koehne2016-11-231-0/+2
| | | | | | | | | | | | | | Write down which files are under CC0, and which under BSD. Change-Id: Ifdbfa3393b2a0f0d857e6c569bd105426c0719cb Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
| * PCRE: Document upstream versionKai Koehne2016-11-191-2/+3
| | | | | | | | | | | | | | | | Also update copyright. Change-Id: I42a23701734c2c8d3ae43f70cc69dfb609b3a7a3 Reviewed-by: André Klitzing <aklitzing@gmail.com> Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* | PCRE2: remove PCRE1 codeGiuseppe D'Angelo2016-12-1276-82988/+0
| | | | | | | | | | Change-Id: I83cf7c22fe95fb6384b751d09867633a72f093db Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | PCRE2: port QRegularExpression to PCRE2Giuseppe D'Angelo2016-12-122-1/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PCRE1 is going towards EOL. PCRE2 is the way forward in terms of new features, performance, and security improvements. The APIs that QRegularExpression uses are similar so the required modifications aren't extensive. The biggest difference comes to JIT-compiling of the pattern. In PCRE1, JIT-compiling did not modify the processed PCRE pattern, but returned a new chunk of data. This allowed multiple threads to keep matching using the same processed data and NULL for the JIT data, until a thread JIT-compiled and atomically set the shared JIT data to the results of the compilation. In PCRE2, JIT-compiling _modifies_ the processed PCRE pattern in a way that it's thread unsafe [1]; the results of JIT-compilation are stored somewhere inside the processed pattern. This means the above approach cannot work -- a thread may be matching while another one JIT-compiles, causing a data race. While waiting for better workarounds from upstream, employ a read/write mutex to protect the matching from JIT-compilation. [1] https://lists.exim.org/lurker/message/20160104.105831.3cb25b39.en.html [ChangeLog][General] QRegularExpression now requires the PCRE2 library, at least version 10.20. Support for the PCRE1 library has been dropped. A copy of PCRE2 is shipped with Qt and will automatically be used on those platforms which lack it. Change-Id: I9fe11104230a096796df2d0bdcea861acf769f57 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | PCRE2: import of PCRE2 10.22Giuseppe D'Angelo2016-12-1155-0/+85150
| | | | | | | | | | Change-Id: Ib2c6210568e8d2f313c5cfcdfdf0a2f09ee356db Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | PCRE2: create a config.hGiuseppe D'Angelo2016-12-111-0/+52
| | | | | | | | | | Change-Id: I9417a29d14def4b5ac4be82ba99023bff7393102 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | PCRE2: add import script from tarballGiuseppe D'Angelo2016-12-111-0/+134
| | | | | | | | | | Change-Id: I09e2622ca2c78b290ecba97ae9fa7274bb7f67b6 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Merge remote-tracking branch 'origin/5.8' into devLiang Qi2016-11-172-3/+3
|\| | | | | | | | | | | | | | | Conflicts: mkspecs/features/mac/default_post.prf mkspecs/features/uikit/default_post.prf Change-Id: I2a6f783451f2ac9eb4c1a050f605435d2dacf218
| * Avoid clang warnings about unused return valuesLars Knoll2016-11-091-2/+2
| | | | | | | | | | Change-Id: Iebec7fb425a92199592cb3ea92190dd0bb5deabd Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * Fix compiler warning/error with clang 3.6Lars Knoll2016-11-081-1/+1
| | | | | | | | | | | | | | | | Clang warns about self assignment, so use the same mechanism as Q_UNUSED for HB_UNUSED. Change-Id: I0894c72fb0936074b15198053464f5bc4b8991d4 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* | Don't disable CoreText on watchOS Simulator (take 2)Jake Petroules2016-11-031-4/+10
| | | | | | | | | | | | | | | | | | Follows up f607233c7ce899c27034eca01c23b0da2895bf93 (which originally introduced this workaround) and 397f345a6a2c69c8f15f5d2f21989c303aca586e (which refactored simulator_and_device not to use exclusive builds). Change-Id: I97f0edefb1bc97167cfa83e4ac0f7581713fb092 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* | Merge remote-tracking branch 'origin/5.8' into devLiang Qi2016-11-029-35/+20
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Blacklist tst_QMenuBar::taskQTBUG46812_doNotLeaveMenubarHighlighted() on macOS. Conflicts: mkspecs/features/mac/default_post.prf mkspecs/features/mac/sdk.prf mkspecs/features/uikit/default_post.prf mkspecs/features/uikit/sdk.prf src/angle/src/libEGL/libEGL.pro src/platformsupport/fontdatabases/fontdatabases.pro src/platformsupport/platformsupport.pro src/plugins/platforms/cocoa/qnswindowdelegate.mm src/plugins/platforms/direct2d/qwindowsdirect2dintegration.cpp src/plugins/platforms/ios/ios.pro src/plugins/platforms/ios/kernel.pro tests/auto/widgets/widgets/qmenubar/BLACKLIST tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp Task-number: QTBUG-56853 Change-Id: If58785210feee3550892fc7768cce90e75a2416c
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-04 22:58:37 +0000