summaryrefslogtreecommitdiffstats
path: root/mkspecs
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* | Detect Visual C++ 2019 mode in clang_cl / intel_iclAllan Sandfeld Jensen2020-03-251-0/+5
| | | | | | | | | | Change-Id: Icdca1551a56e894f6266b33ac059bbbfa3b18453 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Revert "wasm: support emsdk >= 1.39.4"Morten Johan Sørvig2020-03-241-1/+0
| | | | | | | | | | | | | | | | | | | | | | This reverts commit bcdf49bcc6c357c9c30708e2e95ce4b8dbeb9f8a. This was a 5.14-only commit which accidentally found its way to 5.15. Change-Id: Iaef6f05fce20ab61d3afb8cb3c359a037e4c0b28 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
* | Fix whitespace in Qt5XXConfig filesKai Koehne2020-03-241-5/+1
| | | | | | | | | | | | | | Remove some unneeded empty lines, and fix indentation. Change-Id: Ie35e95f35f9625cc75070074be96bdeb62d5fd4c Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | CMake: Also import Qt plugins that are not literally named *PluginKai Koehne2020-03-241-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are some plugins in qtlocation, qtdeclarative whose names are not suffixed with 'Plugin', so the current logic fails to load the corresponding QtModule_XXX.cmake file. Work around this by just searching for Qt5$${CMAKE_MODULE_NAME}}_*.cmake. Users can define QT5_STRICT_PLUGIN_GLOB or Qt5$${CMAKE_MODULE_NAME}_STRICT_PLUGIN_GLOB to change back to the old behavior. [ChangeLog][cmake] Fixed an issue where some Qt location and declarative plugins whose name did not end with "Plugin" where not imported by the corresponding Qt component package. You can force the old behavior by setting QT5_STRICT_PLUGIN_GLOB or Qt5ModuleName_STRICT_PLUGIN_GLOB before the find_package(Qt5 ...) call. Fixes: QTBUG-58812 Change-Id: Ic8adf9562841ed49eabc4f7fb2b5ae257ca606cd Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | Merge "Merge remote-tracking branch 'origin/5.14' into 5.15"Mitch Curtis2020-03-231-1/+1
|\ \
| * | Merge remote-tracking branch 'origin/5.14' into 5.15Mitch Curtis2020-03-201-1/+1
| |\| | | | | | | | | | Change-Id: Ib2a2e3a292af43be3a980c2ccc943c08f4bbf72f
| | * Merge remote-tracking branch 'origin/5.14.2' into 5.14Mitch Curtis2020-03-191-1/+1
| | |\ | | | | | | | | | | | | Change-Id: I34ca28c75b88e882c3f35f182bf01acb22b77637
| | | * Fix regression when doing a debug only build with MSVCKai Koehne2020-03-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qt helper libs for msvc will always get a 'd' suffix for debug builds. This is different than for MinGW, where it will only get a 'd' for mixed debug builds in -debug-and-release scenarios (see commit 1749f9184b97). This amends d32a679, which incorrectly removed the 'd' suffix when linking helper libs built for MSVC. Fixes: QTBUG-82620 Change-Id: I8097de0e1bab4d1e58fc37b0c50ee6b07650a626 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | | | wasm: Boost emscripten 1.39.8 as recommendedLorn Potter2020-03-231-1/+1
|/ / / | | | | | | | | | | | | | | | | | | [ChangeLog][WebAssembly] Updated emscripten to version 1.39.8 Change-Id: I8d19f851eb0c0dd912792cee0db69e61cf4fd5f6 Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
* | | Consider qml dependencies from qrc files in static buildsFabian Kosmale2020-03-181-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qmlimportscanner already has support for qrc files, however the rule in qt.prf did not pass the required arguments to it so far. In combination with the declarative registration of types, this broke static linking. Fixes: QTBUG-82873 Change-Id: I4462645e0b353265f9953807dee73f94923dab9f Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* | | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-03-183-1/+7
|\| | | | | | | | | | | Change-Id: Iaab37b633a8286c2c21425aaac34d30529a3ea82
| * | wasm: support emsdk >= 1.39.4Morten Johan Sørvig2020-03-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Keep using the old/deprecated behavior for the Qt 5.14 series. Task-number: QTBUG-74601 Change-Id: Icee99803f300dfa0116a4de75f9fb26d1010625d Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
| * | winrt: Update capability management to include IOT namespaceAndy Shaw2020-03-112-1/+6
| |/ | | | | | | | | Change-Id: Ib24ecb70454af5ab2e82ebbdc1fed9ef2a52bbb1 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | Android: Bump gradle (plugin) versionsBogDan Vatra2020-03-042-0/+9
| | | | | | | | | | | | | | | | | | Move min & target sdk from AndroidManifest.xml to build.gradle Fixes: QTBUG-70817 Change-Id: Id9bb9825a3232587e0255b2d3d6f0273c5f9b66a Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | Generate separate debug info for Qt tools tooJoerg Bornemann2020-03-031-1/+1
| | | | | | | | | | | | | | | | | | | | If Qt was configured with -separate-debug-info, Qt's tools should be separated from their debug information too. Fixes: QTBUG-56482 Change-Id: Ief0130db1787b767496d0052716183fe773460bf Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | Merge remote-tracking branch 'origin/5.14' into 5.15Lars Knoll2020-02-272-2/+2
|\| | | | | | | Change-Id: I4212d070d5752275085e754b96f0392113604dba
| * MinGW: Fix debug-and-release configurationKai Koehne2020-02-272-2/+2
| | | | | | | | | | | | | | | | | | | | Make sure that, if Qt was configured with -debug-and-release, winmain and user apps are generated by default in debug-and-release mode, too. This amends 9b4ec1393fde2af7deb39b9a2f98bcc93635603f . Change-Id: I0f169d63ca98c9bde41114225004a0844425db33 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-02-261-1/+4
|\| | | | | | | Change-Id: Iad459349ea8b4090d79b4771bfff8f656a8a8189
| * Delay the processing of the doc features to the endAndy Shaw2020-02-251-1/+4
| | | | | | | | | | | | | | | | | | | | | | By delaying it to the end we can be sure that all the Qt modules have their INCLUDEPATHs set and as a result we can avoid long command lines on Windows. Change-Id: I9068f7bf66fe138aad1a633191677a57dfd08d6e Reviewed-by: Paul Wicking <paul.wicking@qt.io> Reviewed-by: Topi Reiniö <topi.reinio@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | Merge remote-tracking branch 'origin/5.14' into 5.15Friedemann Kleint2020-02-201-0/+1
|\| | | | | | | Change-Id: Ide8768d0d95aaeec943658aea27a03737d7dbf3f
| * qmake: Fix handling of QM_FILES_INSTALL_PATHKai Koehne2020-02-181-0/+1
| | | | | | | | | | | | | | | | | | Do not expect the .qm files to be there at qmake time; they will only be generated at build time. Fixes: QTBUG-77398 Change-Id: If73fdb51d40138e52f62eaee0491a5d73d9fe161 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | Merge remote-tracking branch 'origin/5.14' into 5.15Liang Qi2020-02-181-1/+3
|\| | | | | | | | | | | | | | | | | Conflicts: src/corelib/tools/qlinkedlist.h src/plugins/platforms/wasm/qwasmintegration.cpp src/plugins/platforms/wasm/qwasmscreen.cpp Change-Id: Iefca7f9f4966bdc20e7052aca736874861055738
| * wasm: remove dependency on perl to find emscripten versionLorn Potter2020-02-171-1/+3
| | | | | | | | | | | | Change-Id: I0d5224d497b2b5652d1be036f2a90c6c53f0c9df Fixes: QTBUG-81722 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | wasm: fix loading of default_pre.prfLorn Potter2020-02-151-1/+1
| | | | | | | | | | | | | | | | This fixes windows build and detection of c++ version Task-number: QTBUG-80610 Change-Id: I5196e83f9aad6663aea47c31ae4a2da4c4d74e94 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-02-123-9/+17
|\| | | | | | | Change-Id: I8caee4d1ce0eed27d905194df3c3d46c5d07d2b0
| * Fix ANDROID_XXXX replace qmake function callBogDan Vatra2020-02-111-4/+4
| | | | | | | | | | | | | | | | | | | | The second parameter of replace is a regex, therefore trying to replace strings like "plugins/sensors/libplugins_sensors_qtsensors_android.so" will result to super strange results. Fixes: QTBUG-81974 Change-Id: I887e70f4fd8fa2af482a60f63af371f954b56ce1 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| * CMake Support: Fix dependent libraries search for MinGW and CMake 3.17Cristian Adam2020-02-101-1/+1
| | | | | | | | | | | | Fixes: QTBUG-81903 Change-Id: Ie2847e38c196c1f9d664b1a35339cca5ebf424cc Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| * Android: Make sure that it can find qrc files created via the pro fileAndy Shaw2020-02-101-4/+12
| | | | | | | | | | | | | | | | | | | | | | Since Android will place the created qrc files in their own architecture then we need to make sure that we account for this when returning a list of all the resources. This is so that when other files are created that depend on this list, it is able to find them. Fixes: QTBUG-81477 Change-Id: I4a083c1c5c3e0aec35649cf7f5419cf3c6a75eae Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | metatypes: Only load qt_build_paths if we need themUlf Hermann2020-02-111-2/+1
| | | | | | | | | | | | | | | | | | Otherwise this fails for user projects. Fixes: QTBUG-82038 Change-Id: I01bae2aab28bcedf745d1c5ae6932659ed4a7ed5 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | wasm: Change compiler flags to target "upstream" llvmMorten Johan Sørvig2020-02-051-28/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As of version 1.39, Emscripten now uses upstream llvm instead of the "fastcomp" fork. As a result of this em++ no longer builds via the asm.js text format, and the performance issues related to text parsing are gone. Reducing the binary size for debug builds is no longer needed, and we can fall back to using the default build flags. This effectively makes 1.39.x the minimum Emscripten version for Qt 5.15. The "-fastcomp" SDK variant is not supported. Change-Id: Id66ef77294a9accd1b103e34785458d71dc188b1 Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-02-042-34/+46
|\| | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf examples/widgets/widgets/imageviewer/imageviewer.cpp src/corelib/text/qchar.cpp src/corelib/time/qdatetime.cpp Change-Id: I9762f5c4ff650799219729d6aee79ac07ce9024a
| * Add function for initializing plugin resources for static buildsJoerg Bornemann2020-01-302-34/+46
| | | | | | | | | | | | | | | | | | | | Also move the setting of default RCC_DIR into qtFlattenResources as we need a valid RCC_DIR there. Fixes: QTBUG-81699 Fixes: QTBUG-81713 Change-Id: I7558d99f3aca75d2e9cad0ec89fbb0aa0758dcc7 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Add new AVX512 extensions found in Intel CLX, ICL and ICX processorsThiago Macieira2020-02-034-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Cascade Lake (CLX) added AVX512VNNI, Ice Lake has added that plus the integer multiplication (IFMA), the vector bit manipulation instructions (VBMI and VBMI2), bit algorithms (BITALG), the extended vector AES instructions (VAES), among others. I haven't turned on the configure check for those yet. I believe the VBMI and IFMA instructions will be interesting for Qt image algorithms, but we'll need some Ice Lakes to do benchmarking on. Change-Id: Ib5d667bf77a740c28d2efffd15cb43dd821d4b2d Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-01-296-21/+46
|\| | | | | | | Change-Id: I98b1a5a11ece3957a1115c1d9be8841759206ffe
| * Merge remote-tracking branch 'origin/5.14.1' into 5.14Liang Qi2020-01-286-21/+46
| |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: mkspecs/features/create_cmake.prf Done-With: Artem Pisarenko <artem.k.pisarenko@gmail.com> Change-Id: I2ecb9fdca06fe687be8ab3457a58dd81e5e81c4c
| | * Fix qtPlatformTargetSuffix for darwin platformsv5.14.1Joerg Bornemann2020-01-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 1749f918 changed a "mac" scope to a "macos" scope (thanks to the enormously helpful hint from in^Wsanity bot). Instead it should use "darwin", because that's what is equivalent to "mac". Fixes: QTBUG-81599 Change-Id: I0fd82f984945836a5b7b1bea5ed2117a2f676947 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
| | * MinGW: Fix debug builds of applicationsKai Koehne2020-01-222-20/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only expect debug Qt libs with 'd' suffix if Qt was configured with -debug-and-release. This partially amends 9b4ec1393f and 4d289edb1 . Fixes: QTBUG-81325 Change-Id: I56c8965272265cf0a91351aae29d648b8687ec77 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| | * [CMake] Fix handling Qt frameworks link flags in static lib depsAlexandru Croitor2020-01-181-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QMAKE_PRL_LIBS_FOR_CMAKE can contain "-F/foo/bar" entries which are search paths for where frameworks should be found. These should be passed as HINTS to find_library when searching for frameworks. Fixes: QTBUG-81369 Change-Id: I4f699800bd49a1f368b6132823e23d08d1fae604 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| | * Android: Use the values rather than the variables with str_memberAndy Shaw2020-01-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This amends ce04fa345dbe52a022b592dde3ff49514c66b4c2 to correctly get the information out of the variables when using str_member and str_size, as it wants a string rather than a variable for these. Fixes: QTBUG-80582 Change-Id: I8e18e05c605ba1596a7ed7a013f5c6677ab76891 Reviewed-by: BogDan Vatra <bogdan@kdab.com>
| | * Merge 5.14 into 5.14.1Kari Oikarinen2020-01-153-7/+11
| | |\ | | | | | | | | | | | | Change-Id: Ie90edfd16f48e1907fd18288473ac403f62b9032
| | * | Handle resources with dots in the qrc file nameTor Arne Vestbø2020-01-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We were removing the .qrc suffix of resources in a way that assumed the filenames would not have any dots in them, but this is not always the case, and we would end up resolving an empty resource name for file names such as .rcc-bar.qrc (e.g. as produced by the qmlcache system). We now remove the .qrc extension explicitly. Change-Id: I50e1d88ac71ca1335bb05f3dbbb2d9bb441a8d64 Fixes: QTBUG-81255 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
| | * | yacc: Output the path for the move with the right directory separatorAndy Shaw2020-01-131-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: Ic075711062750dde3e3a6bc7a5ba8da25ddecfe9 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-20 13:36:50 +0000