summaryrefslogtreecommitdiffstats
path: root/src/3rdparty
Commit message (Collapse)AuthorAgeFilesLines
* Remove .prev_CMakeLists.txt filesJoerg Bornemann2021-01-122-237/+0
| | | | | | | | | | Those serve no purpose anymore, now that the .pro files are gone. Task-number: QTBUG-88742 Change-Id: I39943327b8c9871785b58e9973e4e7602371793e Reviewed-by: Cristian Adam <cristian.adam@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Remove the qmake project filesJoerg Bornemann2021-01-0716-572/+0
| | | | | | | | | | | | | | | | Remove the qmake project files for most of Qt. Leave the qmake project files for examples, because we still test those in the CI to ensure qmake does not regress. Also leave the qmake project files for utils and other minor parts that lack CMake project files. Task-number: QTBUG-88742 Change-Id: I6cdf059e6204816f617f9624f3ea9822703f73cc Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Upgrade md4c to 0.4.7Giuseppe D'Angelo2021-01-044-86/+131
| | | | | | Change-Id: I9400c2df13c30fb0bc14728a0c44851c2d1e9079 Pick-to: 6.0 5.15 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* Replace QtTest headers with QTestDavid Skoland2020-12-224-4/+5
| | | | | | | | | | | Complete search and replace of QtTest and QtTest/QtTest with QTest, as QtTest includes the whole module. Replace all such instances with correct header includes. See Jira task for more discussion. Fixes: QTBUG-88831 Change-Id: I981cfae18a1cabcabcabee376016b086d9d01f44 Pick-to: 6.0 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* CMake: Regenerate projects using pro2cmake one last timeAlexandru Croitor2020-12-102-0/+2
| | | | | | | | | And fix up some wrong qmake project files Pick-to: 6.0 Change-Id: I66cb82aeb9c1419a74df1a650fa78a511ade7443 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* PCRE: update to 10.36Giuseppe D'Angelo2020-12-0734-13242/+4166
| | | | | | | | | | | | Dropped the RTEMS patch (upstream now uses posix_madvise). Drop support for the TILE architecture (dropped by upstream). [ChangeLog][Third-Party Code] PCRE2 has been updated to version 10.36. Pick-to: 6.0 5.15 Change-Id: Idb4467bef0ff520605b8b5d9188b9d67d8e4d0f2 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* CMake: Re-generate project files in srcJoerg Bornemann2020-11-301-0/+1
| | | | | | Pick-to: 6.0 Change-Id: I1f5f822d68129490f1a7c495f718aead0b520ca9 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Install 3rd party headers and meta for static buildsMichal Klocek2020-11-163-1/+6
| | | | | | | | | | | | | | | | | When doing static builds any project which uses same libraries as qtbase 3rd party libraries will most likely end up in broken binaries, since symbols will be included twice. Moreover, libraries can have different versions. Install 3rd party headers and meta data for: * qtlibpng * qtfreetype * qtharbuzz Pick-to: 5.15 Task-number: QTBUG-87154 Change-Id: I243dff9a12a95af20dee414f55bb762b8d579c81 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Update third-party md4c to version 0.4.6Shawn Rutledge2020-11-033-129/+135
| | | | | | | | | | | | If you try to parse markdown containing null characters, it should not crash anymore. [ChangeLog][Third-Party Code] md4c was updated to 0.4.6. Pick-to: 5.15 Fixes: QTBUG-87965 Change-Id: I6e0ac6f4ecb41c0836f22c7a6a2d510102c933c0 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* Android: disable Gradle caching by defaultAssam Boudjelthia2020-10-291-2/+4
| | | | | | | | | | | If enabled by default, the cache size will grow quickly, especially if multiple different projects are managed every day. Keep the option commented, which can be enabled manually by the user. Pick-to: 5.15.2 Change-Id: I6d4a67f4f1bb3e37b02de7ff4c534ec4d006f9a3 Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io> Reviewed-by: Rami Potinkara <rami.potinkara@qt.io>
* Revert changes in strto(u)ll.c to avoid integer overflowsRobert Loehning2020-10-263-25/+32
| | | | | | | | Found in oss-fuzz issue 26045. Pick-to: 5.12 5.15 Change-Id: Id9eac1b4f67ad9bbe2d92dd69cd03338a6ced74e Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fix included license text for PCRE2 - Stack-less Just-In-Time CompilerKai Koehne2020-10-251-1/+1
| | | | | | | | | | [ChangeLog][Third-Party Code] Changed license text of "PCRE2 - Stack-less Just-In-Time Compiler" component. The documentation (incorrectly) included the generic PCRE2 license so far. Pick-to: 5.15 5.12 Change-Id: I7b36a640ba83fb6087fe28d77f9435af13f8c84d Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Fix copyright information for src/3rdparty/xcbKai Koehne2020-10-251-1/+1
| | | | | | | | | | | The new copyright lines are taken from xcb-proto-1.13/COPYING, and xcb-proto-1.13/src/xinput.xml. [ChangeLog][Third-Party] Fixed copyright information for "XCB-XInput". Pick-to: 5.15 Change-Id: I8afa4dab39765b85a015524fe16b085dcfe5a864 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* CVE-2020-15999: Heap buffer overflow in freetypeWerner Lemberg2020-10-201-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. Pick-to: 5.15 5.12.10 Change-Id: I23824074f134802b3e4f737877d144b59e6b8151 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* sqlite: Upgrade to 3.33.0Andy Shaw2020-10-173-9937/+10673
| | | | | | | | | [ChangeLog][QtSQL][sqlite] Upgraded to v3.33.0 Pick-to: 5.15 Pick-to: 5.12 Change-Id: I379d8c62b449d4c6b04e5154c8c1a86761e5466e Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* 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. Pick-to: 5.15 5.12 Change-Id: I238d973d937fbfc3a81627c4c65491fbb5cb3c30 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Remove workaround for MSVC 2008Allan Sandfeld Jensen2020-09-301-2/+1
| | | | | | | We don't build on platforms without stdint.h Change-Id: Iee9de3e71a7bcae524f2d1377919cf074a713960 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* CMake: Regenerate projects to use new qt_internal_ APIAlexandru Croitor2020-09-236-33/+33
| | | | | | | | | | | Modify special case locations to use the new API as well. Clean up some stale .prev files that are not needed anymore. Clean up some project files that are not used anymore. Task-number: QTBUG-86815 Change-Id: I9947da921f98686023c6bb053dfcc101851276b5 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Fix dead link in thirdparty license documentationKai Koehne2020-09-191-1/+2
| | | | | | | | | | bistream-vera is not a known license for SPDX. Instead use a DejaCode URN. Handling of such URN's is done in a separate patch in qtools. Pick-to: 5.15 Change-Id: I687507ab05d2d377a50dbc0a1037071a9de68341 Reviewed-by: Paul Wicking <paul.wicking@qt.io> Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* Android: remove --no-daemon arg for GradleAssam Boudjelthia2020-09-173-1/+12
| | | | | | | | | | | | | | Allow Gradle builds to run using JVM daemon, this will improve the current build time noticeably for clean builds and hugely for incremental builds. This will bring the Gradle build to comparable speed with a normal Gradle build in Android Studio. Task-number: QTBUG-86674 Pick-to: 5.15 Change-Id: Icc4267223802e4c9350b48099236650c023f868d Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* forkfd/Linux: ask clone() to use the SIGCHLD as the termination signalThiago Macieira2020-09-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because of these lines in the Linux kernel (kernel/fork.c, see [1][3]): if (clone_flags & CLONE_VFORK) trace = PTRACE_EVENT_VFORK; else if (args->exit_signal != SIGCHLD) trace = PTRACE_EVENT_CLONE; else trace = PTRACE_EVENT_FORK; Without CLONE_VFORK (which we can't use), if the exit signal isn't SIGCHLD, the debugger will get a PTRACE_EVENT_CLONE, which makes it think the process we're starting is a thread, not a new process. Both gdb and lldb remain attached to the child and when it later performs an execve(), they get mightily confused. See gdb bug report[5]. The idea of not having an exit_signal was so that no SIGCHLD would be delivered to the parent process in the first place. That way, some misguided SIGCHLD handler (*cough* GLib *cough*) wouldn't reap our processes. Unfortunately, what I didn't realize was that the kernel sends SIGCHLD anyway (see [2][4]), so this defensive measure didn't actually work. Consequently, we can pass SIGCHLD to clone() and get the debuggers working again. [ChangeLog][Linux] Fixed an issue that would cause debugging a Qt application that uses QProcess to confuse both gdb and lldb if the Linux kernel was version 5.4 or higher. Behavior outside of a debugging session was not affected. [1] https://code.woboq.org/linux/linux/kernel/fork.c.html#_do_fork [2] https://code.woboq.org/linux/linux/kernel/signal.c.html#do_notify_parent [3] https://elixir.bootlin.com/linux/v5.8/source/kernel/fork.c#L2432 [4] https://elixir.bootlin.com/linux/v5.8/source/kernel/signal.c#L1925 [5] https://sourceware.org/bugzilla/show_bug.cgi?id=26562 Fixes: QTBUG-86319 Pick-to: 5.15 Change-Id: I2fc68c725ba649218bd9fffd1633863613537d42 Reviewed-by: Dimitrios Apostolou <jimis@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de> Reviewed-by: hjk <hjk@qt.io>
* Include harfbuzz header files without harfbuzz/ parent directoryDimitrios Apostolou2020-09-163-3/+3
| | | | | | | | | | | | | | | | | | | | | This is in accordance to the examples from harfbuzz docs: https://harfbuzz.github.io/ch03s03.html The fix is because `pkg-config --cflags harfbuzz` returns the subdirectory as include path, for example: -I /usr/local/include/harfbuzz and this caused the system-harfbuzz not to be found when /usr/local/include was not included by default (recent change on macOS) and the code was doing #include <harfbuzz/hb.h>. Fixes: QTBUG-85568 Change-Id: I12a34638e8ad5e3085768828457f0bfa1a2c68ad Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
* CMake: Fix building with -DQT_FEATURE_gui=OFFAlex Richardson2020-09-151-3/+3
| | | | | | | | | | Some CMake files currently assume that QtGui is always enabled and we get a configure-time failure without these changes. Task-number: QTBUG-86053 Change-Id: I28e32c180c32221f32519017bac6b518a19d5983 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Doc: Improve WinTab license informationKai Koehne2020-09-111-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" Pick-to: 5.12 Pick-to: 5.15 Change-Id: Iba7538f67b43ceca2e599fc1ede520962d4a7e43 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Improve license information for libpngKai Koehne2020-08-261-2/+2
| | | | | | | | | | Use the official name and ID from SPDX: https://spdx.org/licenses/libpng-2.0.html Pick-to: 5.15 Change-Id: I199efd600373cdc150d48a449b122f90ff2c48ef Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* MSVC: Fix C4996 warnings when building QtKai Koehne2020-08-191-0/+2
| | | | | | | Task-number: QTBUG-85227 Pick-to: 5.15 Change-Id: I22ca672d993d77164c91939d1b8fad0c0332b57a Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Android: Copy required gradle files in non-prefix shadow buildsAlexandru Croitor2020-08-181-4/+10
| | | | | | | | | | | | This fixes running 'make apk' in a qmake android project, when using a shadow non-prefix build. An implementation detail is that COPIES can't take both files and directories as values, so we split them into two steps. Task-number: QTBUG-85399 Change-Id: I7373d6b7aede6e33096cb9718c679fa5e5dc1703 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* CMake: Fix copying of gradle resources in non-prefix buildsAlexandru Croitor2020-08-141-8/+7
| | | | | | | | Amends b1f8ca8032bd0500f356c55c335937f7fb89d3f5. Task-number: QTBUG-85399 Change-Id: Ibf0d721a7735dabd48e069a6098d1d9338cde660 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Make clang-format ignore formatting of third party codeEirik Aavitsland2020-08-061-0/+2
| | | | | | Pick-to: 5.15 5.12 Change-Id: I865f86a1f9967971c4e525e634279a26ce11f688 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Update bundled libjpeg-turbo to version 2.0.5Eirik Aavitsland2020-08-068-15/+47
| | | | | | | | [ChangeLog][Third-Party Code] libjpeg-turbo was updated to version 2.0.5 Pick-to: 5.15 5.12 Change-Id: I9d4c403fbc998243c32d1bf1f1fbaf53270ffb9c Reviewed-by: Liang Qi <liang.qi@qt.io>
* 3rdparty: Add reference C implementation of BLAKE2Linus Jahn2020-07-316-0/+1436
| | | | | | | | | This is required for adding support of the BLAKE2 hashing algorithms in QCryptographicHash. Change-Id: Icc981c3a99a2713fdd1c18766b05619254650622 Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Revert "Add missing override" for 3rdparty vk_mem_alloc.hAlexander Volkov2020-07-291-70/+70
| | | | | | | | | This partially reverts 9bad3508fccb058261d47e023400868147f2d733. Disable -Wsuggest-override for gcc when including the header instead. Change-Id: Id2507ce731da62bbd64aa6477b181735ba62adc1 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* sqlite: Upgrade to 3.32.3Andy Shaw2020-07-163-82/+255
| | | | | | | | | [ChangeLog][QtSQL][sqlite] Upgraded to v3.32.3 Pick-to: 5.15 Pick-to: 5.12 Change-Id: I3c00fb6b0bd7daa3465b38ac6536b82d0b16596f Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Android: Don't treat gradle.pro as a buildable targetAndy Shaw2020-07-161-0/+2
| | | | | | | | | | | | | | When installing gradle it can conflict as it will treat it as the target and therefore install it as an executable although it is a directory inside this one. As this does not build anything but is really an installation target, we can mark it as aux template and change the target name to avoid any conflicts with the existing directory. Pick-to: 5.15 Task-number: QTBUG-80938 Change-Id: I000ee57521818b6d4d30d770362ff4700846e576 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* Disable PCRE2 JIT on macOS ARM64Tor Arne Vestbø2020-07-103-2/+13
| | | | | | | | | | | | It's already disabled for many other ARM platforms, and upstream support for Apple Silicon is still pending, so we disable it for now. See: https://bugs.exim.org/show_bug.cgi?id=2618 Fixes: QTBUG-85528 Pick-to: 5.15 Pick-to: 5.12 Change-Id: I42b6e5efaa07c9b832cd05a47436eb86a214e9bf Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Mark gradlew with Unix eol endings as it is a scriptAndy Shaw2020-07-101-0/+1
| | | | | | | | | | | | Since this could end up being copied from a Windows machine to another when it is part of a project using Android then we should make sure the line endings are preserved to be on the safe side. This avoids a strange problem when deploying due to gradle failing to run. Change-Id: Ie170461a351c9279092b58d4e8353b81cc8561d3 Pick-to: 5.15 5.12 Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com> Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
* forkfd: remove FFD_VFORK_SEMANTICSThiago Macieira2020-06-303-9/+0
| | | | | | | | | | | | | | | This will never work, not unless libc implements it themselves, since the child process is not allowed to return from the function that does the vfork(), as subsequent use of the stack would trash the frozen parent's return address, and in our case that's syscall(). Instead, we may add a vforkfd() function that takes a callback function that will be called in that context, like the glibc clone(3) wrapper does. Pick-to: 5.15 Change-Id: I1dba29bc0f454df09ca1fffd161800b453c00593 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* CMake: Fix pcre2 compilation with intelcet part 2Alexandru Croitor2020-06-252-0/+80
| | | | | | | | | | | | | I somehow forgot that we build the pcre2 sources not only as part of the bootstrap library and qmake, but also as separate library as well. Apply the flags to the bundled library. Amends 976fa5134aea52741df7b25a196fa36251dc932f Amends fa98adbd04de9d44ce921436b92589a41f285dcd Change-Id: Ia1db3a8bd731c7e3ee4d7109be8e2ef98c594070 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* forkfd/linux: add support for RISC-VAndreas Schwab2020-06-231-1/+1
| | | | | | Pick-to: 5.15 Change-Id: I758a401abd6851839908e09aec51edbe4aa95925 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* forkfd/linux: handle failure from sys_cloneAndreas Schwab2020-06-231-0/+2
| | | | | | Pick-to: 5.15 Change-Id: I98a28a816fdc089cefcbf8f42053ddffedc10cdf Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Suppress warning of unused function on macOSThiago Macieira2020-06-121-0/+3
| | | | | | | | | | This function is only used on FreeBSD and Linux. forkfd.c:243:12: warning: unused function 'convertForkfdWaitFlagsToWaitFlags' [-Wunused-function] Pick-To: 5.15 Change-Id: I99ab0f318b1c43b89888fffd160bf81f01960f2f Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Remove winrtOliver Wolff2020-06-066-17/+5
| | | | | | | | | Macros and the await helper function from qfunctions_winrt(_p).h are needed in other Qt modules which use UWP APIs on desktop windows. Task-number: QTBUG-84434 Change-Id: Ice09c11436ad151c17bdccd2c7defadd08c13925 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* Update the qt_attribution.json for SQLiteAndy Shaw2020-06-041-2/+2
| | | | | | | | | This got forgotten when SQLite was upgraded to v3.32.1, so this amends e10e989ce83027f2f620bb6948be4948f3c91e76 Change-Id: I75799b6c55bc39c4cc050b5eb18a99d9f197410c Pick-to: 5.15 5.12.9 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* sqlite: Upgrade to 3.32.1Andy Shaw2020-06-045-2134/+3057
| | | | | | | | | | | The patches applied are now removed as they are all included in v3.32.1 [ChangeLog][QtSQL][sqlite] Upgraded to v3.32.1 Pick-to: 5.15 Pick-to: 5.12 Change-Id: Ib5b26fb36d7ca49c1108a96097a48fe5b797f291 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* CMake: Regenerate tools and 3rd partyAlexandru Croitor2020-05-291-0/+3
| | | | | Change-Id: I38e065cddc954e8594a5dce823c3bb5385a8a1e8 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Actually apply the shadow stack Intel CET flagsGiuseppe D'Angelo2020-05-281-2/+2
| | | | | | | | | | C&P mistake dropped $$ from qmake variables, my fault. Will squash manually in 5.15 to avoid introducing a bug there. Amends fa98adbd04. Change-Id: I3ce33dba16f512cd20c8d3c6adc4c1a09506c1ea Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Fix compilation of PCRE2 under Intel CETGiuseppe D'Angelo2020-05-271-0/+5
| | | | | | | | | | | | Ubuntu 20.04 enables -fcf-protection by default. PCRE2 10.35 sees this but complains that -mshstk is also necessary to build its JIT. Detect whether the compiler is enabling Intel CET automatically, and if so, build PCRE2 with the right options. Pick-to: 5.15 Change-Id: I3440e689b81f4f07055f211a4fa7331a43eb410d Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Remove ANGLELaszlo Agocs2020-05-26732-266631/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This marks the end of EGL and OpenGL ES support on Windows. The concepts of -opengl dynamic, -opengl desktop, QT_OPENGL=software, etc. remain unchanged, with the exception of the disapperance of everything ANGLE related. CMake builds now work identically to qmake on Windows: they default to 'dynamic' OpenGL on Windows, unless -DINPUT_opengl=desktop is specified. On Windows, Qt 6 is expected to default to the "dynamic" OpenGL model by default, just like Qt 5.15. This can be changed by switching to "desktop" OpenGL, which will link to opengl32 (publicly, so other libs and applications will do so as well) and disallows using another OpenGL DLL. The "dynamic" mode is essential still because the fallback to a software rasterizer, such as the opengl32sw.dll we ship with the Qt packages, has to to work exactly like in Qt 5, the removal of ANGLE does not change this concept in any way (except of course that the middle option of using ANGLE is now gone) When it comes to the windows plugin's OpenGL blacklist feature, it works like before and accepts the ANGLE/D3D related keywords. They will then be ignored. Similarly, requesting QT_OPENGL=angle is ignored (but will show a warning). The D3D11 and DXGI configure time tests are removed: Qt 5.14 already depends on D3D 11.1 and DXGI 1.3 headers being available unconditionally on Win32 (in QRhi's D3D11 backend). No need to test for these. [ChangeLog][Windows] ANGLE is no longer included with Qt. Dynamic OpenGL builds work like before but ANGLE is no longer an option. OpenGL proper or an alternative opengl32 implementation are the two remaining options now. Attempting to set QT_OPENGL=angle or Qt::AA_UseOpenGLES will have no effect on Windows. Fixes: QTBUG-79103 Change-Id: Ia404e0d07f3fe191b27434d863c81180112ecb3b Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Add missing overrideAlexander Volkov2020-05-211-70/+70
| | | | | | Change-Id: I88000e82ecbdc55e621dc8e22aff5e8f55cf9d0e Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* CMake: Generate information about 3rdparty libs in module .pri filesJoerg Bornemann2020-05-195-0/+5
| | | | | | | | | | | | | For modules that are not yet ported to CMake and that use QMAKE_USE += libfoo we need to provide the information about libfoo in the qt_lib_XXX.pri files. Also, we now generate qt_ext_XXX.pri files for bundled 3rdparty libs. Task-number: QTBUG-75666 Change-Id: I9e4b057a197554ecb37c294c0bf09e2a2b3aa053 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-03 23:14:51 +0000