summaryrefslogtreecommitdiffstats
path: root/mkspecs
Commit message (Collapse)AuthorAgeFilesLines
* Android: use shell path format when running qmake install stepAssam Boudjelthia2020-10-061-1/+1
| | | | | | | | | | | On Windows shell, using unix path format might not work, since the shell expects backslash paths only. Task-number: QTBUG-87066 Change-Id: I51741b475c1ede11336df63ee1c6092c792c16ef Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit e60a337f4ed5c716b87f2318a2595c793fb4bca8) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Pass -arch when running toolchain configure test on Apple platformsTor Arne Vestbø2020-09-211-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>
* Android: allow setting javac build version from the configure scriptAssam Boudjelthia2020-09-161-1/+10
| | | | | | | | | | | | The configure options -android-javac-source and -android-javac-target can be used to set the version numbers. Fixes: QTBUG-86282 Change-Id: I36b0665de2c31e16bf6d138859b5503455eb8e66 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Andy Shaw <andy.shaw@qt.io> (cherry picked from commit 675805e9eb0dc68a6e96622353073fd54161bdaf) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* re_escape QMAKE_INCDIR_VULKANLaszlo Agocs2020-09-151-1/+1
| | | | | | | | | | | Avoid getting errors like the following: Encountered invalid regular expression 'C:\VulkanSDK\1.2.131.2/include'" Change-Id: I734995878d24bc124f486fb5145ea64d0d5a9c64 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit b56ed4da746e0b1f1b4f4e9fba6b857a3e050399) Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* Fix java mkspec for compatibility with JDK 12Christian Romberg2020-09-071-1/+1
| | | | | | | | | | | | | | Starting with JDK 12, javac no longer supports source and target version 6. This commit changes the source and target version to 7. [ChangeLog][General] Fixes: QTBUG-79094 Change-Id: Ife8966db01c68251de2fe85307de30c31e658172 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> (cherry picked from commit 8409844bd66f0186ed227a58db687f0d748ada22) Reviewed-by: Christian Romberg <c.romberg@icloud.com> Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
* Android: Fix building apps when Qt is configured with one ABIAlexandru Croitor2020-08-263-3/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | When configuring with Qt only with one ABI, certain code paths were not triggered, which led to a few issues: - The deployment json file generated by androiddeployqt listed no architectures. - The compiled shared library did not have a lib prefix and arch suffix, which androiddeployqt during the deployment / make apk step. To fix the architectures missing in the json file, ANDROID_ABIS needs to be set in android/resolve_config.prf also in the single abi case. To get the correct file names, android.prf needs to apply the prefixes and suffixes not only in the build_pass case (multi-abi) but also in the single abi case (except for config.tests). The application-binary entry in the json file needs to be without the extra prefixes and suffixes though, so make a copy of the TARGET value to be used in the json file, before the name manipulations are applied. Task-number: QTBUG-85399 Change-Id: Idde92ab7fe883636ccc65a87b91c8a3fc72eefbb Reviewed-by: Alessandro Portale <alessandro.portale@qt.io> (cherry picked from commit b45533161e0a3c0b83c5a11e842ed970227a22de) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* configure: Explicitly enable float-divide-by-zero with ubsanRobert Loehning2020-08-071-3/+3
| | | | | | | | | | [ChangeLog][QtCore][mkspecs] Explicitly enable float-divide-by-zero when configuring Qt with "-sanitize undefined". Before clang 9, it was implicitly enabled when -fsanitize=undefined was set. Change-Id: I0faf3ae1901d4badc6d265fa8081185be4360636 (cherry picked from commit 7d7e62967fb7b9b689f4a688be71722f80a6bdda) Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Remove no-longer-applicable -Wno-error for GCCThiago Macieira2020-08-061-9/+0
| | | | | | | | | | | | | We don't appear to have implicit fallthroughs in our code anymore. The last deprecated copies and redundant moves are also gone. The other warning never had an explanation and doesn't show up when building full Qt anyway. Change-Id: Iad959315ad374ef288f5fffd15d683599a1a11b9 Reviewed-by: Marc Mutz <marc.mutz@kdab.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit 797e18118bc74597f1211e993f58451aaa6f081c)
* Android: Install the qmldir files when configuring for a single abiAndy Shaw2020-08-035-5/+5
| | | | | | | | | | | | This amends 0ef46b41d86b9fad4fc4a18bd577d208afa1fce8 to ensure the new configuration is styled correctly for qmake. Task-number: QTBUG-80938 Change-Id: Iebfff3ff0570d2e92d01d4eb1178c0d6261468f9 Reviewed-by: Lars Schmertmann <lars.schmertmann@governikus.de> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit 7d4baabdaefdc20cc7df6314230916477c76e7ff) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Limit OpenGL deprecation silencing on Apple platform to Qt itselfTor Arne Vestbø2020-08-032-2/+7
| | | | | | | | | | | | | | | | | | | | | | | Apple deprecated the entire OpenGL API in favor of Metal, which we are aware of, so we don't need to see the warnings when building Qt. Instead of applying the silencing globally for all Qt consumers, both internal and external, we now limit the silencing to Qt itself. That means user code that explicitly uses any of the deprecated APIs will see the warnings. Note that this does not apply to merely using any of the Qt OpenGL APIs. The user has to explicitly use the platform APIs that have been deprecated. The warnings need to be disabled on a build system level, so that that they are passed as -D flags on the command line. If the defines were done in Qt headers (qguiglobal.h e.g.), they would require the user to always include this header before any of the Apple headers. Change-Id: I3f2a2a5211332a059ad4416394251772c677fdcb Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit 1048d83fc29d77e7a8def35ba41454fe35f4747b) Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* Android: fix regexp error in android_deployment_settings.prfAssam Boudjelthia2020-07-311-1/+1
| | | | | | | | | | | This might be related to the change a1947aeffe158a0ea7de3ced1bf8d6a4719a27ef. Fixes: QTCREATORBUG-24321 Change-Id: I1c697e3130abd3eb26776d352a0f9bff0065c8f6 Reviewed-by: Kai Koehne <kai.koehne@qt.io> (cherry picked from commit 443a187c9192bacd329dfcb195464cfec6e9151b) Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* Android: Enable configuring for a single abi architectureAndy Shaw2020-07-104-4/+6
| | | | | | | | Fixes: QTBUG-80938 Change-Id: Id87202e6b2520b18c6b06b71675157f588a28bd6 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit 0ef46b41d86b9fad4fc4a18bd577d208afa1fce8) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* qmake: Stop using -isystem flagDmitry Shachnev2020-06-253-3/+0
| | | | | | | | | | | | | | This option changes the order of include paths, which can cause problems of various kinds. See https://bugs.debian.org/958479 for an example. The benefit of that option is minimal for what it was intended. Additional change added when cherry-picking: build the GTK platformtheme with -Wno-error=parentheses flag, to fix GCC errors with GTK < 3.23. Change-Id: I80eeabd09764df290b60bc59aeb2f90d07723608 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> (cherry picked from commit f133b226cdf4f2736b412bb642b45d43cb84f51d)
* Raise the Android SDK build requirement to lvl 28 - compile fixAlex Blasche2020-06-251-1/+1
| | | | | | | | | | | | | | | | | First of all cmake and qmake used a different standard. Secondly, the qmake logic enforced lvl 23 (if it was installed which is the case on the failing machine). When this is combined with f71a400bf61 which requires lvl 28 API to build, the android build fails to compile. cmake logic was even worse as it enforced lvl 21 API to be used if installed. This change requires pick to 5.15 as f71a400bf61 was picked as well. Change-Id: I89a7193b711b8bf927d02907343a49d6f27082ce Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> (cherry picked from commit 21b5c7875cc39c575b14b190add676a5b96fb0b5) Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
* Fix include paths for prefix + framework + qtlibinfix builds of QtJoerg Bornemann2020-06-041-1/+1
| | | | | | | | | | | | | | | | Prefix framework builds of Qt that use the -qtlibinfix had wrong include paths in qt_lib_XXX.pri files which broke compilation of user projects. We now honor QT_LIBINFIX in qt_lib_XXX.pri files. However, due to how framework includes work, module-style includes like #include <QtCore/qstring.h> still do not work. Use <qstring.h> or <QString> instead. Fixes: QTBUG-84219 Change-Id: I5314ee810e64cbba6dba06a84064d48bb4ff3377 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> (cherry picked from commit a6d475d7db23620fc67c23303913beab3bc445e8) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Remove whitespace for file names generated from TARGETKai Koehne2020-06-022-3/+12
| | | | | | | | Task-number: QTBUG-84492 Change-Id: I70e79b7a57949e8dfd3781967e775bdea8822e0c Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit 1e17d0e9d7c8aca0e5c629fb4480ee271a1390f8) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix compilation of PCRE2 under Intel CETGiuseppe D'Angelo2020-06-021-0/+2
| | | | | | | | | | | | | 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. Change-Id: I3440e689b81f4f07055f211a4fa7331a43eb410d Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> (cherry picked from commit 7c8c8272b49372b2a9fd4f95b7a7f31347c06497) (cherry picked from commit fa98adbd04de9d44ce921436b92589a41f285dcd)
* wasm: add more debugging informationLorn Potter2020-05-291-2/+3
| | | | | | | | | | This also fixes source maps not getting created in debug mode. Fixes: QTBUG-83607 Change-Id: I3ed388c4fef6c286fa452a1c700fa65c2a8f9529 Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io> (cherry picked from commit bc380b242d758fd0342f50ea882272c14fed9db8) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Override debug generation request on mac for toolchain.prfMichal Klocek2020-05-281-1/+1
| | | | | | | | | | | | | | Override request for debug info during compiler 'test', otherwise call to dsymutil will fail call with /dev/null. Use case here is to pass for example -glldb with CXXFLAGS. Fixes: QTBUG-62953 Fixes: QTBUG-84467 Change-Id: Ief8f987afb40d0b90da732195d67d476e7bb3aff Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> (cherry picked from commit d479c6db2c8d723994ba2eee8f54f94dae826c84) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Android: Fix RESOURCES for Android MultiAbIBogDan Vatra2020-05-221-1/+1
| | | | | | | Change-Id: I57560f51115ae560e3133096f402c6c9735f15a6 Reviewed-by: Andy Shaw <andy.shaw@qt.io> (cherry picked from commit eaa619130735fadf915bd43a76d5bbf312a97214) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Remove -qt-xcb, -system-xcb from README and commentsKai Koehne2020-05-191-1/+1
| | | | | | | | | The options got removed in commit 60588e1a5dd Change-Id: Ic94f58885dab6de3c563b3dab70385570864b47d Reviewed-by: Gatis Paeglis <gatis.paeglis@qt.io> (cherry picked from commit b19ccc3af4ee4eafac16e2107a07cd488f3f941b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Configure: Do not automatically enable compilation of examples for testsKai Koehne2020-05-191-8/+1
| | | | | | | | | | | | If user's specified to build without examples we shouldn't silently overwrite this. This might mean that some tests will fail to run then, though. Fixes: QTBUG-84087 Change-Id: I53748fc03354ffdf015f85c93efc6e86c446adb8 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> (cherry picked from commit 99817446843bfb06799d74b9db171dbd3de7d24b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix solaris buildKai Koehne2020-05-181-0/+1
| | | | | | | | | Fixes enabling of fPIC that got removed as a side-effect of commit 39fc377bf. Fixes: QTBUG-83949 Change-Id: I2bed7edb5b1f97192cbcf9e12dd927a17803d864 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit ca33e7a7406f2301883e0f6fdc382e8f8aa58b94)
* Fix core headers makefile warningsMichal Klocek2020-05-161-3/+3
| | | | | | | | | | | | | | | | | | Since 4da47d0fba0 we have extra 'target', it is added in qt_module.prf and also in qt_installs.prf resulting in duplicated target installation rules for macOS framework builds. This spits out few warnings when doing core_headers like: warning: overriding commands for target `install_target' Try to avoid adding second 'target' and since we install headers already in dummy_install, just skip the target in qt_installs.prf Task-number: QTBUG-57656 Change-Id: I084ab7a5a3bda6511f1c2f4a8f0a875aceab6286 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* CMake: Don't hard-code the sysroot in Qt5XXXConfigExtras.cmakeJoerg Bornemann2020-05-141-1/+8
| | | | | | | | | | | | Instead of writing the hard-coded sysroot into the .cmake file, write the variable ${CMAKE_SYSROOT}. This makes it possible to relocate the build to a machine where the sysroot is different from the build machine. Fixes: QTBUG-83335 Change-Id: Iaa69feb9a140b050f6b5547929cc940ee0f039ce Reviewed-by: Rolf Eike Beer <eb@emlix.com> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Merge remote-tracking branch 'origin/5.15.0' into 5.15Qt Forward Merge Bot2020-05-141-1/+1
|\ | | | | | | Change-Id: I06396fa0a3d1687a0935e48d290358edbb0e59e8
| * Fix scanned resources in static buildsv5.15.0Tor Arne Vestbø2020-05-111-1/+1
| | | | | | | | | | | | Fixes: QTBUG-81621 Change-Id: Ica23e99054c7b2498bdb1e256c256c8b430938b4 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | Allow switching of QT_NO_CREATE_VERSIONLESS_TARGETSKai Koehne2020-05-051-8/+8
|/ | | | | | Fixes: QTBUG-83774 Change-Id: Ib3f2507a917046426b94a779e205012ce52cbfe9 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Fix building of autotests for certain configurationsOliver Wolff2020-04-281-5/+16
| | | | | | | | | | | | | | | | | | When a configuration is static and has builtin_testdata defined, it was possible that the "testdata" resource that is generated in testcase.prf was used for a qmlimportscan directly. This generated test data resource is no file though. It's a "qmake struct" that contains files and a base folder so that we should add every file from the "file list" of that struct. It is possible, that the generated resource has a base, but no files. Thus we need two loops or we can end up with a command line that ends with "-qmldir". If qmlimportscanner decided to warn/error out in this case in the future this feature could be broken and the point of breakage might not be obvious. Change-Id: I2111f594f7d5cf40521b8fe9236a8be9e2ed1b07 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* iOS: Use storyboard instead of .xib file for launch screenTor Arne Vestbø2020-04-263-46/+49
| | | | | | | | | Apps on the iOS app store are required to use storyboards for their launch screens from June 30th 2020. Change-Id: Iae34042294fb167a2c893542c57dfaacaf1e929c Fixes: QTBUG-83512 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Fix build with -no-compile-examplesKai Koehne2020-04-231-0/+4
| | | | | | | | | | | | | | | configure -no-compile-examples means that the examples won't be compiled, but processed by qmake to generate install targets. So we shouldn't do any substitution (like it is done for CMake targets), or extra compilers / copies (like it is done for qmltypes). Also install the qmldir files that some qml examples need. Fixes: QTBUG-83375 Fixes: QTBUG-83704 Change-Id: I6a9393bd914d98a5d85f4089205510e49a435842 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Merge remote-tracking branch 'origin/5.15' into 5.15.0Qt Forward Merge Bot2020-04-215-5/+110
|\ | | | | | | Change-Id: I9d9f9e0955144241fcee6148fc78c4501e2ffcea
| * Merge "Merge remote-tracking branch 'origin/5.14' into 5.15"Liang Qi2020-04-202-3/+12
| |\
| | * Merge remote-tracking branch 'origin/5.14' into 5.15Liang Qi2020-04-202-3/+12
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mkspecs/features/qt_common.prf src/network/ssl/qsslsocket_openssl_symbols.cpp src/network/ssl/qsslsocket_openssl11_symbols_p.h src/network/ssl/qsslsocket_opensslpre11_symbols_p.h src/plugins/platforms/wasm/qwasmeventdispatcher.cpp Done-With: Timur Pocheptsov <timur.pocheptsov@qt.io> Change-Id: I04fb3139a0e2efd4bc2f0959f131679f192fa0f8
| | | * Fix path replacement on install for header module prl filesJoerg Bornemann2020-04-081-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For prefix builds the prl files of header modules still contained the absolute path of the install prefix instead of $$[QT_INSTALL_LIBS]. This was, because the QMAKE_PRL_INSTALL_REPLACE variable was only filled for 'lib' TEMPLATE projects. Header modules, however, have the 'aux' template. Fixes: QTBUG-82871 Change-Id: I90f248967f1bff41423d871a977ae91c78015bbd Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| | | * macOS: Fix CONFIG+=separate_debug_info for custom QMAKE_BUNDLE_EXTENSIONJoerg Bornemann2020-04-081-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code that sets up QMAKE_RESOLVED_BUNDLE did not take QMAKE_BUNDLE_EXTENSION into account. The logic is the same as in UnixMakefileGenerator::init(). Fixes: QTBUG-83222 Change-Id: I8fc4f16b399303394f2106e5c1071347ace93d4a Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| * | | Add option to select build target for IntegrityJanne Koskinen2020-04-201-2/+10
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From 11.7.6 onwards you need to select if your build is rel/dbg/chk/cov. Added env variable where you can add which build target to configure. Task-number: QTBUG-74716 Change-Id: I9ab3dd6177c5c5fa1da6aa7556784fa86d0d0348 Reviewed-by: Timo Aarnipuro <timo.aarnipuro@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| * | Add mkspec for INTEGRITY Qualcomm SA8155P ADPKimmo Ollila2020-04-172-0/+88
| | | | | | | | | | | | | | | Change-Id: I3430868fb88f357c3d2d1d3cd8e00088aa26649c Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | | winrt: Fix manifest creation for Visual Studio 2019Oliver Wolff2020-04-211-7/+6
|/ / | | | | | | | | | | | | | | | | | | - 2019 still uses VCLIB version 140 - minVersion and maxVersionTested have to be set for every MSVC version Change-Id: I9300e03115e2e99fd250ec85bdd7f3367ab00d48 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: André de la Rocha <andre.rocha@qt.io> Reviewed-by: Miguel Costa <miguel.costa@qt.io>
* | WASM: Replace NO_EXIT_RUNTIME=0 with EXIT_RUNTIME=1Fredrik Orderud2020-04-081-1/+1
| | | | | | | | | | | | | | | | Get rid of double negation to make the configuration easier to understand. Change-Id: I5dfe256c2ac2ef131c3db20dce9ff492c529a5b1 Reference: https://emscripten.org/docs/tools_reference/emcc.html Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-04-081-0/+4
|\| | | | | | | Change-Id: I34a71ddbc6afb1f12a0a044d0d3876e1af58d60c
| * Fix linking of header only Qt5Zlib for cmake static buildsKai Koehne2020-04-061-0/+4
| | | | | | | | | | | | Fixes: QTBUG-79547 Change-Id: Ibd810b5415ae8f7a965caf8b94b0df834a867836 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | Merge "Merge remote-tracking branch 'origin/5.14' into 5.15"Qt Forward Merge Bot2020-04-031-2/+2
|\ \
| * | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-04-031-2/+2
| |\| | | | | | | | | | | | | | | | | | | Conflicts: tests/benchmarks/corelib/text/qstringlist/qstringlist.pro Change-Id: Ie9b97bd83c2df00fd9b556b5f09d405f71970169
| | * Pass SDK root to the linker as -isysroot, not -Wl,-syslibrootTor Arne Vestbø2020-04-021-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The former option to clang will result in more options to the linker, such as the newly introduced -platform_version, which writes the SDK version to the resulting binary. By using the syslibroot flag directly we were missing the platform version, and binaries were left without an SDK version set, resulting in failed validation of the binary. Going with the clang driver gives us the right behavior for free. Fixes: QTBUG-83100 Change-Id: I98bc9ba644dae4bcc7a6a88481556bae185ce5fa Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> (cherry picked from commit 6a60192ac03d0b4ab542191065122243cebcd1ca) Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* | | wasm: add support for enabling AsyncifyMorten Johan Sørvig2020-04-031-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ./configure […] --device-option EMSCRIPTEN_ASYNCIFY=1 Set QT_HAVE_EMSCRIPTEN_ASYNCIFY as a feature flag, enable optimizations for asyncified debug builds. Change-Id: I81c887a411780e328aed48ec09ff6b9277c3bccf Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
* | | wasm: remove obsolete configMorten Johan Sørvig2020-04-031-14/+0
|/ / | | | | | | | | | | | | | | On emsdk 13.9.x WASM_OBJECTS_FILES is always on, and BINARYEN_TRAP_MODE is not needed Change-Id: Id1da1db0278e131f95045bc0902f5cc4c22c1522 Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
* | Merge remote-tracking branch 'origin/5.14' into 5.15Liang Qi2020-03-311-1/+2
|\| | | | | | | | | | | | | Conflicts: tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp Change-Id: Ifaa56153f5f0d687a6b4d94f84fcfa1e1751afd2
| * MinGW: Fix build with -angleKai Koehne2020-03-271-1/+2
| | | | | | | | | | | | | | | | Since Qt 5.14, debug libs for MinGW don't necessarily have a 'd' suffix anymore. Fixes: QTBUG-83087 Change-Id: Ia9f499ebed05e96fb056134681a2124c2262fb08 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | wasm: refactor network to use fetch APILorn Potter2020-03-261-1/+2
| | | | | | | | | | | | | | | | | | | | This has better support for threaded use, and gets rid of bind use. This requires emscripten 1.38.37 and above Task-number: QTBUG-76891 Change-Id: Ic30a6820c2ce945c314751c06cfc356914a71217 Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-03 11:22:09 +0000