summaryrefslogtreecommitdiffstats
path: root/mkspecs
Commit message (Collapse)AuthorAgeFilesLines
* Update MSVC qmake mkspecs to make -std:c++20 available for VS2019 16.11+Christian Heimlich2022-02-121-0/+8
| | | | | | | | | | | Set QMAKE_CXXFLAGS_CXX2A variable to -std:c++20 while building projects with qmake and MSVC 16.11 or greater (_MSC_FULL_VER >= 192930133), when c++2a is specified in the project config. Change-Id: If9a48d1ed16cb05c5cc01414ce8a4344e22438fe Reviewed-by: Kai Koehne <kai.koehne@qt.io> (cherry picked from commit cc70c397cefe12436e2228fd70bb1f043ca260a7) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Add c++20 alias for c++2a in qmake default mkspecs featuresChristian Heimlich2022-02-101-0/+1
| | | | | | | | | | | Implemented as an alias to keep c++2a working and remain consistent with the way this was handled for the c++20 switch in cmake and the c++17 switch in qmake. Change-Id: I9a5f6d6b3a3adec748cf7207ceaa6da98d053cdb Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit 920c1e9d56f5ef95bf5335d9aead4a7bf5e836be) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* INTEGRITY: Prevent deletion of virtual functionsKimmo Ollila2022-01-251-2/+2
| | | | | | | | | | | | | | | | In release builds -olink also enables deletion of (unused) virtual functions. In some cases this can lead to application crashes when using loaders combined with timers. Prevent this by adding -no_uvfd option to release build flags. Task-number: QTBUG-99506 Change-Id: I5c669e1e987f1fe912c9aca52ff82000125eed53 Reviewed-by: Tatiana Borisova <tatiana.borisova@qt.io> Reviewed-by: Janne Koskinen <janne.p.koskinen@qt.io> Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io> (cherry picked from commit dac76bb442c02abab63cc805734ff8041e07fd2b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* qmake: Allow using Windows 10 API in MinGW qmake internal projectsAlexandru Croitor2022-01-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When trying to build qt3d examples with qmake and MinGW in the CI, compilation would fail with errors like In file included from C:/MINGW1120/mingw64/x86_64-w64-mingw32/include/windows.h:72, from C:\Users\qt\work\qt\qt3d\examples\qt3d\simple-cpp\main.cpp:63 include/winuser.h:2965:72: error: 'POINTER_INPUT_TYPE' was not declared in this scope What happens is that calling qmake on examples.pro loads qt3d/.qmake.conf, which then loads qt_build_config.prf which then defines the following definitions: mingw: DEFINES += WINVER=0x0601 _WIN32_WINNT=0x0601 This limits usage of Windows API up to Windows 7, with later APIs being unavailable. Most .qmake.conf files were removed in qt repos, but We didn't remove the .qmake.conf file (fb656c036db0549180073e133773862d08f6cd24) for qt3d because it's supposed to be buildable with CMake + Qt 6 as well as qmake + Qt 5. Bump the defines to the same Windows 10 version we use everywhere else when building with CMake. Amends 6652bf2353d807f724f398a15cb22c188830f57c Relates to d57a7c41712f8627a462d893329dc3f0dbb52d32 Relates to fb656c036db0549180073e133773862d08f6cd24 Task-number: COIN-762 Task-number: QTBUG-92271 Change-Id: I833dfb6b0832d90a76d05ea14cd3807cb0d67ca9 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit a585ce70562cae09643e6eb488d457f7755c7c90) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update copyright year to 2022Kai Köhne2022-01-051-1/+1
| | | | | | | | Change-Id: If6f1d6f9f82a601f8e2b6d36650d6e737518aa60 Reviewed-by: Paul Wicking <paul.wicking@qt.io> Reviewed-by: Topi Reiniö <topi.reinio@qt.io> (cherry picked from commit 6205cb161d393f96c670d57bca29fed2dcfda14c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* iOS: Use generic simulator device for building apps via xcodebuildTor Arne Vestbø2021-12-232-9/+11
| | | | | | | | | | | | | | | | | | | If Xcode wasn't configured with any simulators the build would fail since we had no device to build for. But we don't need to build for a specific device, we can build for the generic simulator device, just like we do for the non-simulator build. This likely didn't work properly at the time it was first implemented, but now seems to work fine, and is less fragile than the current solution. Running tests still enumerates the available simulators, as that needs a concrete device to run on. Fixes: COIN-777 Change-Id: I50e31c1b350cf83ce348275b467051263dea88a9 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> (cherry picked from commit cd2690dcbfc79d4bd7146c410a5edbdc477f92b5) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Doc build: fix conflicting response file with mocSamuli Piippo2021-11-291-7/+7
| | | | | | | | | | | | | | Doc build is using the same variable to define the reponse file as moc build, which can lead to case where moc is using the qdoc's response file instead of its own. Moc needs more include paths than qdoc, this can then lead to weird compilation issues as moc doesn't warn about missing includes. Task-number: QTBUG-98569 Change-Id: Id35da18f664e2032bae96d11b00dbfe55ce37f66 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit ca9d72f4652e21ecaf6e50be2e7b851c4ec69486) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Android: bump default QT_ANDROID_API_VERSION to 31Assam Boudjelthia2021-11-121-1/+1
| | | | | | | | | | To allow using Android 12 APIs. Change-Id: I5e9da66c84457888ec723125d16876891232a99b Reviewed-by: Ivan Solovev <ivan.solovev@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit e6e8c59485b8ba8dda9b6bfd203fb1c68f1c2e47) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Bump WINVER, _WIN32_WINNT and _WIN32_IE to _WIN32_WINNT_WIN10 (0x0A00)Yuhang Zhao2021-11-111-0/+5
| | | | | | | | | | | And bump NTDDI_VERSION to 0x0A00000B (NTDDI_WIN10_CO) at the same time, to unblock the developers from accessing the latest Windows APIs. Change-Id: Ifbc28c8f8b073866871685c020301f5f20dc9591 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> (cherry picked from commit 6652bf2353d807f724f398a15cb22c188830f57c)
* qmake: Support Visual Studio 2022Joerg Bornemann2021-11-112-0/+10
| | | | | | | | | | | | | Extend the detection of the MSCV_VER variable and make VS 2022 known to the vcxproj generator. [ChangeLog][qmake] Added support for Visual Studio 2022. Fixes: QTBUG-97975 Change-Id: Id2c0a0b7800f721e9e34189f0a40ba4830283578 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit 1c880752eb891e77c3d3b5ffbf60fbb9109120fb) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* macOS: Bump max supported SDK version to 12Tor Arne Vestbø2021-11-041-1/+1
| | | | | | | Change-Id: Ib4980719fe372abfb2566fe4e82db29226a7fcfa Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> (cherry picked from commit 63feecfc11640d66b6b0c663f97ffcc0abfb6181) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix version number when warning about Apple platform SDK mismatchTor Arne Vestbø2021-11-031-1/+1
| | | | | | | Change-Id: I9b9cda0c6bb9ad527dbf4b4268c1b572aa04d164 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> (cherry picked from commit 0babdac53700ba383d5ec44d52166ab39b9bcaed) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* wasm: remove sse2 config blockMorten Johan Sørvig2021-10-271-7/+0
| | | | | | | | | | | | | | | This breaks the build for qmake-based applications, with the error Project ERROR: Could not find feature sse2. Remove the offending section to make applications build again. Change-Id: I0b22faa1d8d62e208d79879b822e21637bb03a3e Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit 2c3cfa0ae71e8f21ea39a79364a57a103ca54d75) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* wasm: add simd supportLorn Potter2021-10-051-0/+8
| | | | | | | | | | | | | | | | | | | Emscripten only supports SSE1, SSE2, SSE3, SSSE3, SSE4.1, SSE4.2, and 128-bit AVX instruction sets at this time. https://emscripten.org/docs/porting/simd.html Browsers might need to enable simd support in the advanced configurations about: config or chrome:flags Enable by configuring Qt with -sse2 Fixes: QTBUG-63924 Change-Id: Ifeafae20e199dee0d19689802ad20fd0bd424ca7 Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io> (cherry picked from commit 0e100a4d892cbdcdb7f326213ec1e4d0d1ae6d89) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QDateTime: fix build with MinGW: need unistd.h very earlyThiago Macieira2021-09-301-0/+2
| | | | | | | | | | | | qobject.h has #include <chrono>, which #includes <ctime>, which includes <time.h>. datetime.cpp:2621:23: error: 'localtime_r' was not declared in this scope; did you mean 'localtime_s'? Change-Id: I2bbf422288924c198645fffd16a922719c4ce7d4 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> (cherry picked from commit 684c9b82b9b8216f406c59deb35cd727ffb6d69b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* qmake: Print error when iOS simulator device could not be foundJoerg Bornemann2021-09-221-1/+5
| | | | | | | | | | | | | | | | | | A qmake project built for iOS-simulator tries to find suitable devices in xcodebuild.mk. If no suitable device could be found, the build failed with xcodebuild: error: missing value for key 'id' of option 'Destination' which isn't that helpful. Detect the situation in xcodebuild.mk and print an error message. Fixes: QTBUG-77222 Change-Id: I02f9ab0dd7b8f234bcd8d0ea387927f31ca092e0 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> (cherry picked from commit ad4faa25a524da8291525ca0afe2f2a65bf6b456) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Android: Fix path of qmake_qmake_immediate.qrc in single_abi with qmakeAssam Boudjelthia2021-09-201-2/+8
| | | | | | | | | | | | | | With single_android_abi, the file qmake_qmake_immediate.qrc is laid directly into the root of the build dir and not under different abis dirs. Fixes: QTBUG-87669 Fixes: QTBUG-95202 Fixes: QTBUG-95235 Change-Id: Ie13cccdf2fc323e8fd725a94f3aacab465fa1287 Reviewed-by: Andy Shaw <andy.shaw@qt.io> (cherry picked from commit e6892f38a084e514bf9c501f3045b297f6260714) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix .qm file name calculation in lrelease.prfJoerg Bornemann2021-09-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | The following snippet in a .pro file resulted in a build error: CONFIG += lrelease embed_translations TRANSLATIONS += foo.bar_de.ts The variable QM_FILES was incorrectly calculated. The extra compiler that calls lrelease uses QMAKE_FILE_IN_BASE, which wraps QFileInfo::completeBaseName(), resulting in "foo.bar_de.qm". The $$replace call that calculates the .qm file name however, produces "foo.qm". Fix this mismatch by adjusting the regular expression to behave like QFileInfo::completeBaseName(). Fixes: QTBUG-79016 Change-Id: I545d1b58170cd5229007faf31c9b2c6f70ff75a6 Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> (cherry picked from commit 5678ee93b428e57983b5bc698bcba27dfb56960b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* xcode: Allow automatic provisioning updates when calling xcodebuildTor Arne Vestbø2021-09-101-0/+4
| | | | | | | | | | | | | | If automatic signing is enabled (which it is by default), then Xcode will happily set up the required profile if you open and run the application in Xcode. To get the same behavior for xcodebuild, and hence from Creator, since it's calling our Makefile wrapper around xcodebuild, we need to pass the -allowProvisioningUpdates flag to xcodebuild. Fixes: QTBUG-95565 Change-Id: I9325bb228bdfb4d07658eff8f41798f7b5a6955c Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit 16b11bb81eb02f182e3570c9241f57c5689fb90e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* qmake: Add support for C17/C18Joerg Bornemann2021-08-313-1/+4
| | | | | | | | | | | | | Make it possible to select the C17/C18 standard with CONFIG += c17 or CONFIG += c18 Fixes: QTBUG-96026 Change-Id: I719d22366c3efda009118d58ead173a25ed285c0 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit 9004575f4b2aee7bf3c55522affd10555d134c51) Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Update Android default SDK from 29 to 30Juha Vuolle2021-08-272-2/+2
| | | | | | | | | | | | By the time of Qt 6.2 release all new apps targeting Play store must target API level 30 (Android 11) or above (starting in 08/2021 for new apps and 11/2021 for existing apps' updates). Task-number: QTBUG-94451 Change-Id: Id7fa2fd62899a7259e365c917292c6c3ac0d2b0d Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> (cherry picked from commit 17d7a8dc2e2df577a769cd84cba946a726e8872a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* qmake: Make it possible to set CONFIG += c11 with MSVC 19.28Joerg Bornemann2021-08-271-0/+6
| | | | | | | | | | | | | The compiler that comes with Visual Studio 16.8 added support for setting the C11 standard with the /std:c11 flag. Add the respective version check in msvc-version.conf and set MSVC_VER and QMAKE_CFLAGS_C11 accordingly. Task-number: QTBUG-89296 Change-Id: I29b54ee073a765918f5aa4ebb081b97c5cf471d7 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit 8914f80b278c030b2a6cc505e809b51920e178ce) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Check QMake support for building apps on INTEGRITYTatiana Borisova2021-08-271-0/+4
| | | | | | | | | | -Add integrity QMAKE_* paths for SA8155P device Task-number: QTBUG-95671 Change-Id: Ife60cf2db74bfd0c47103e2dd6aaa73609d856d2 Reviewed-by: Janne Koskinen <janne.p.koskinen@qt.io> (cherry picked from commit 664a7947beb0a48990406f04ef50d28b6291f860) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix location of qtattributionsscannerKai Köhne2021-07-191-1/+1
| | | | | | | | | Amends f00c63093b0313f Change-Id: I3be5f7d3826c1a84bad0ecf947eecc0a351685c6 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit de58fa3038da8457490bcb2f160701f3bbb2d9be) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix qmlimportscanner path for android deployment settingsIvan Solovev2021-06-281-1/+1
| | | | | | | | Fixes: QTBUG-94527 Change-Id: Iffd259caecfdfe6860ba1ab9cb21d2f164060b9a Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> (cherry picked from commit 4fc14b19336531c96f5883ff4b06f9af1ddaa30d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix linking of debug projects against release Qt on Darwin platformsJoerg Bornemann2021-06-251-18/+25
| | | | | | | | | | | | | | | | | | | | | Consider a release-only, non-framework Qt build on macOS. Building a debug user project would fail, because qmake tried to link against *_debug.dylib and *_debug.a libraries. Building a debug user project that uses QtUiTools against a release-only framework-build Qt posed the same problem. QMake tried to link against the libQt5UiTools_debug.a, which does not exist. Fix this by maintaining a list of library file candidates, and use the first existing one (or just the first one if none exists). This favors the library matching the user project's configuration but falls back to the release version of the library if necessary. Fixes: QTBUG-81251 Change-Id: I8d641104718edb16500c6d6e3994e736fa5ddcf4 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit 50e664835bc2130e8693364641f9aaa7133b6998) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* macOS: Respect QMAKE_APPLE_DEVICE_ARCHS by building for all those archsTor Arne Vestbø2021-06-252-8/+20
| | | | | | | | | | | If QMAKE_APPLE_DEVICE_ARCHS is not set, we pick up the available archs based on what Qt was built with (QT_ARCS), but only build the active arch. Change-Id: I83273f878022af34a3a0d0eeae8b11d781f78c49 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit b0a9825edb490de9e2af09bb91fb6f1819fd7616) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* qmake: Enable response files for WASM on WindowsJoerg Bornemann2021-06-151-0/+2
| | | | | | | | | | | | This fixes the "Command line is too long" error when building a project with many object files for WASM on Windows. Fixes: QTBUG-94032 Change-Id: I29251da9795b267c968da86617da0311bf882a64 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Lorn Potter <lorn.potter@gmail.com> (cherry picked from commit 4372cac01cb811b995d3142d8d8e93182937a03d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* qmake: Switch to using Xcode's new build systemTor Arne Vestbø2021-06-081-2/+0
| | | | | | | | | | | | | | | | | Now that inputs (81152194) and outputs (3f0858ed) are explicitly set for the preprocess stage we can enable the new build system. Using the legacy build system will produce a build error in Xcode 13, but the build will succeed: error: The Legacy Build System will be removed in a future release. You can configure the selected build system and this deprecation message in File > Project Settings. Fixes: QTBUG-71035 Pick-to: 6.1 5.15 5.12 Change-Id: I108d2103872255d10de2ff5161eef892065da1c4 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* qmake: Pick default architecture on macOS based on unameTor Arne Vestbø2021-05-211-6/+12
| | | | | | | | | | | | | | | | | | | | | | | When dealing with a universal build of Qt, we would end up using the QT_ARCH as the architecture for user projects, but this architecture is always the primary one that Qt was configured with. Instead of relying on QT_ARCH, we start writing QT_ARCHS (plural) to qconfig.pri, based on CMAKE_OSX_ARCHITECTURES, and then use that to initialize QMAKE_APPLE_DEVICE_ARCHS. We then resolve the active arch using uname -m, matching what CMake does. We still feed all the available architectures to the Makefile or Xcode project, so that the user can build for any of the available architectures without needing a reconfigure. Fixes: QTBUG-93760 Change-Id: I0d338241ba4d944ca36d85371e9c4df7dbc4f269 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Move qtwaylandscanner to libexecKai Köhne2021-05-111-1/+1
| | | | | | Task-number: QTBUG-88791 Change-Id: I9703ba73ec5cee11b000d84346d4f8d00c179724 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Move qmlimportscanner to libexecKai Köhne2021-05-111-1/+1
| | | | | | Task-number: QTBUG-88791 Change-Id: I71150af4965458225e7bbbd72ffc4f60c6854625 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* WASM: Don’t set “-g4” by default for qmake buildsMorten Sørvig2021-04-271-6/+18
| | | | | | | | | This increases link time significantly; instead set "-g4" or the new "-gsource-map" only if source maps are enabled. Change-Id: Ibe2d438d48e9ae2fce5f79d4e8a9f17c01cf2485 Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
* Cleanup leftover QWSTasuku Suzuki2021-04-142-4/+0
| | | | | | | QWS is replaced with QPA in Qt5 Change-Id: Iccec38e55ae23a27ebecd8010e1df7bba8aa5a33 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Merge integration refs/builds/qtci/dev/1617809473Qt CI Bot2021-04-071-6/+4
|\
| * Fix condition that adds resources for each Android ABIAlexey Edelev2021-04-071-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | If we already have the list of Android ABI in BUILDS, it's not necessary to generate extra resource while Qt build. Amends: 58556afb6960b442f88649b550aaec8e1a04338b Pick-to: 6.0 Pick-to: 6.1 Pick-to: 5.15 Fixes: QTBUG-88031 Change-Id: I344efe6c477461659a360281da59c4abeae18fc2 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | Merge integration refs/builds/qtci/dev/1617805866Qt CI Bot2021-04-071-1/+1
|\ \ | |/ |/|
| * Only embed launch screen when building an appChristoph Keller2021-04-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | Xcode's new build system checks duplicated entries when building. Qmake wants to embed the launch screen for all types of configurations (static libraries etc.) which makes Xcode bail out with "Multiple commands produce LaunchScreen.storyboard". Pick-to: 6.0 6.1 5.15 5.12 Task-number: QTBUG-71035 Change-Id: I5c028e687f16e046b12156c1a8a89540deba4d3b Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* | Remove last trace of licheckKai Köhne2021-04-071-15/+0
|/ | | | | | | | | | Since we don't feature it for CMake, there's little point in keeping it for qmake. Pick-to: 6.1 Change-Id: I7f17d2536510c0b94dca9767036ceab7ec08e1d8 Reviewed-by: Tino Pyssysalo <tino.pyssysalo@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* wasm: add cmake build supportLorn Potter2021-04-012-18/+18
| | | | | | | | | | | | | | | | A few configure defines get changed: QMAKE_WASM_PTHREAD_POOL_SIZE is now QT_WASM_PTHREAD_POOL_SIZE QMAKE_WASM_TOTAL_MEMORY is now QT_WASM_INITIAL_MEMORY QMAKE_WASM_SOURCE_MAP_BASE is now QT_WASM_SOURCE_MAP_BASE device-option EMSCRIPTEN_ASYNCIFY=1 is QT_EMSCRIPTEN_ASYNCIFY=1 To create source maps for debugging. use device-option QT_WASM_SOURCE_MAP=1 Task-number: QTBUG-78647 Change-Id: If9f30cd7fb408c386d6d69b5f7b1beecf1ab44b5 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* qmake: Improve error message when detecting macOS platform SDK upgradeTor Arne Vestbø2021-03-192-4/+11
| | | | | | | Pick-to: 6.1 6.0 5.15 Task-number: QTBUG-85546 Change-Id: I2bce9d22ad826fa73fa4dbfd03c9b1d404c57859 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* Fix a typo in resources_functions.prfTasuku Suzuki2021-03-161-1/+1
| | | | | Change-Id: I38b81ba63612bd90b0a70f6b0c468667581b3c11 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Merge "Android: use libexec path for rcc for Android deployment settings file"Assam Boudjelthia2021-03-111-1/+1
|\
| * Android: use libexec path for rcc for Android deployment settings fileAssam Boudjelthia2021-03-111-1/+1
| | | | | | | | | | | | | | Task-number: QTBUG-88791 Pick-to: 6.1 Change-Id: Ie34278496e0c23a8301e7ab0f2e33e36f393d1d8 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | Bump Apple platform minimum versionsAlexandru Croitor2021-03-104-6/+4
|/ | | | | | | | | | | | | | | | | | | | | | Includes both minimum deployment targets and minimum sdk versions. As per supported Apple platforms versions which was done in qt/qtdoc at 8807fdedce29cbbd7662fcd745234da30eace3fb For Qt for iOS 6.0.x we only bump the minimum deloyment target because applications seem to crash with iOS 12.4+, and it's better to have a build error than a runtime error. The minimum required sdk will not be bumped for 6.0.x, so we don't accidentally break someone's existing build, given that 6.0 is already released. Pick-to: 6.1 Task-number: QTCREATORBUG-23574 Change-Id: I3046384164f2d7fdbd0cfd16dcb85e0d60bc56ce Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* Move syncqt.pl to libexecJoerg Bornemann2021-03-041-1/+1
| | | | | | | | | | | | | To not disturb the qmake build we kept syncqt.pl in <src>/bin but installed it to libexec. This is not necessary anymore. This also removes the need for having syncqt.pl in both, bin and libexec in the build dir of qtbase. Pick-to: 6.1 Fixes: QTBUG-91076 Change-Id: I44b014ea41e3f00c420e02fd5c76f11169340b8c Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Fix qmake's metatype generation feature after moving moc to libexecJoerg Bornemann2021-02-251-1/+1
| | | | | | | | This commit amends 1f30bcf33618ca39c47dc1058529b55635e30aef. Pick-to: 6.1 Change-Id: I677bd75bffddab6d764108e4fb2826e01c9dcb07 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Move build tools to libexec instead of the bin dirJoerg Bornemann2021-02-236-7/+24
| | | | | | | | | | | | | | [ChangeLog][Build System] Tools that are called by the build system and are unlikely to be called by the user are now installed to the libexec directory. This is a step towards easier co-installability of different Qt versions. Pick-to: 6.1 Task-number: QTBUG-88791 Change-Id: Id19575b5ba27795f7715e4ea6a09391b26dd4942 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* qmake: Introduce QT_HOST_LIBEXECS propertyJoerg Bornemann2021-02-181-1/+2
| | | | | | | | | This will be used to access host tools that are installed in ${prefix}/libexec instead of ${prefix}/bin. Pick-to: 6.1 Change-Id: I36c4b5736330f8229d267a117c65d55cd5e12758 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Fix the qmake error when building with qtquickcompiler for iOSAlexey Edelev2021-02-181-3/+5
| | | | | | | | | | | | | | | Fix condition when adding qmake_immediate to resources. This condition was wrongly positive in any non-android case, but also had to check for BUILD emptiness or build_pass. This cause issue because qmake_qmake_immediate was added to the RESOURCES variable earlier, than actually generated. Fixes: QTBUG-88031 Pick-to: 6.0 Pick-to: 6.1 Pick-to: 5.15 Change-Id: I38dad858a7e81ab709e622ec24baa8f9b80970fa Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-18 21:20:32 +0000