summaryrefslogtreecommitdiffstats
path: root/mkspecs/features
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/tqtc/lts-5.15.14' into ↵v5.15.14-lts-lgpl5.15Tarja Sundqvist2024-05-081-1/+1
|\ | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: Ibe29c3c6b47675d0a342bff3db91e79a3ea8a166
| * Update Copyright year to 2023Kai Köhne2023-04-251-1/+1
| | | | | | | | | | | | Change-Id: I8812bf2523ccb715407181aec6aebf2034c8ff84 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit 70bc5dcb756042627d52c8cb4c4ae6d490b971e2)
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.12' into ↵Tarja Sundqvist2023-10-111-2/+0
|\| | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: Ie633210bf47c0a8738f0278a2d2b6362334ca564
| * Remove QMAKE_RANLIB and QMAKE_LINK_SHLIB from android/default_pre.prfAlexey Edelev2022-12-011-2/+0
| | | | | | | | | | | | | | | | | | | | | | The values should come from android-clang mkspecs. The hardcoded values don't work correctly with recent Android NDKs. Fixes: QTBUG-108662 Change-Id: Ie153a50ee0c49bd4f0704b588a4e2c87a05c1063 Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> (cherry picked from commit 49f62e8c5a8aef4c0b7fd6867a30e653d2f5dd98) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.11' into ↵v5.15.11-lts-lgplTarja Sundqvist2023-06-093-6/+11
|\| | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: Iac056a5e9f59fc8d1929171c18039aeb45be22b8
| * qmake: Fix installation of separate debug info for pluginsJoerg Bornemann2022-08-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This amends commit fc2e40e88d44d457ec5ebd1cc235696f3f478be9. For Qt plugins, we do not add 'dlltarget' to INSTALLS but only 'target'. In this case we must add the .dll.debug file to 'target' like we did before fc2e40e88d4. Fixes: QTBUG-105374 Change-Id: If495548dfca55d02e1c5884e03e281e27ee07ccd Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io> (cherry picked from commit 38ca34ac935e222d532fc5f6939efaa15c633b39) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| * Add the missing RCC_DIR to '.qrc' paths when generating deployment settingsAlexey Edelev2022-06-291-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | Looks like this part of the path was lost, when back-porting to 5.15. Amends c8645045d03fd6ece0174f5d72c3b14f9ec2c550 Task-number: QTBUG-87669 Task-number: QTBUG-95202 Task-number: QTBUG-95235 Change-Id: I32de439f52acd912795180f6050b19df8cedd44e Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| * qmake/MinGW: Install separate debug info of DLLs next to the DLLJoerg Bornemann2022-06-221-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...instead of next to the import library. If separate_debug_info is enabled then we would create an install rule that puts the .dll.debug file next to the .a file. GDB however expects the file to be next to the .dll. Fix the installation rule in separate_debug_info.prf accordingly. This affects the MinGW packages of Qt 5.15 and user projects targeting MinGW. Fixes: QTBUG-86790 Change-Id: If91c356e7e7f7f4330ebc43691e414929f9beb4b Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit fc2e40e88d44d457ec5ebd1cc235696f3f478be9) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| * macOS: Ensure proper quoting when calling otool in objc_namespace scriptTor Arne Vestbø2022-05-231-3/+3
| | | | | | | | | | | | | | | | Change-Id: I0c7fc40d321277103f6e80f221884cd87df6f930 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit ebd4f7bcce6d48864187748ee5e20199ca55a76a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.10' into ↵v5.15.10-lts-lgplTarja Sundqvist2023-04-245-36/+79
|\| | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: Ic1bb4240ca70a8a361fa0267476707446579221d
| * Fix CMake warning about "missing closing ' quote"Kai Köhne2022-05-061-1/+1
| | | | | | | | | | | | | | Amends 2d929d011 Change-Id: Ic884370e7d38ea695f90ee71ddbac5c9215fa6d1 Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
| * objc_namespace: Add support for universal binariesTor Arne Vestbø2022-04-191-19/+49
| | | | | | | | | | | | | | Change-Id: If6a15c1ec27fe0e1a42764fbcd194d7806aecf0c Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit bb3c80e05127f80e51d49f138aa9dfa76a62ee7e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| * objc_namespace: Fix misspelled argument for silencing outputTor Arne Vestbø2022-04-191-1/+1
| | | | | | | | | | | | | | | | Change-Id: I318a57e193bd10f8dbd2b22ab173a2940ba1dad9 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit e6e443e0bb05446860cff04650bf43b2aceb4920) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| * objc_namespace: Update parsing logic to account for otool changesTor Arne Vestbø2022-04-191-14/+26
| | | | | | | | | | | | | | | | | | | | | | The textual output of otool in recent Xcode releases has changed. We now look for OBJC_CLASS_RO/OBJC_METACLASS_RO rather than class_ro_t. Change-Id: I86192e91e55d8deb7e5c6790b327855fc0f7e594 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit 661931aa98c820f5ed40953af9b53484c0a59be0) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| * qmake: Add support for C++23Joerg Bornemann2022-04-132-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | Add the CONFIG value c++2b that represent the upcoming C++23 standard. Add QMAKE_CXXFLAGS_CXX2B and QMAKE_CXXFLAGS_GNUCXX2B. On MSVC, use /std:c++latest when c++2b is active. Task-number: QTBUG-102202 Change-Id: Ie00ee5793c1a649195013c8c19efc8d59cf0acc9 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io> (cherry picked from commit b5ed3cb7baeb6d77c375134719ee04ffcc211b9f) Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
| * qmake: Ignore stderr when determining the macOS SDK versionJoerg Bornemann2022-03-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If xcrun prints warnings or errors to stderr while determining the SDK version, they become part of the SDK version string. This then leads to a qmake error. Intentionally ignore stderr so that it is not treated as part of the SDK version. Fixes: QTBUG-102066 Change-Id: I023296b430aac1407c970412c5cf1010bd81589b Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> (cherry picked from commit 845d28cafbe56df3092f3c0fc5a28805e9cfe530) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.9' into ↵v5.15.9-lts-lgplTarja Sundqvist2023-03-233-4/+3
|\| | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: Iaff6b55275e50d19973e1020853d8622587069f9
| * iOS: Use python3 for enumerating test target devicesAlexandru Croitor2022-03-181-1/+1
| | | | | | | | | | | | | | | | | | | | macOS 12.3 removed python 2 Fixes: QTBUG-101745 Change-Id: Ieace2623e838cf36a7a68186b0f729ff0f19299a Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit 9ec05e4f361f11796177ff2d26eaa078d733ad82) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| * winrt appxmanifest: Properly replace VCLibs version for newer MSVC versionsOliver Wolff2022-02-171-2/+1
| | | | | | | | | | | | | | | | | | | | | | Newer versions of MSVC 2019 do not have 16.0, but 16.x as their MSVC_VER. These versions still use vclibs version 140, so we need a more generic way of replacing that string inside appxmanifest. Fixes: QTBUG-82314 Change-Id: I8fbd13c825a001ae7f516305157e9263477c2199 Reviewed-by: Jussi Witick <jussi.witick@qt.io> Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
| * Update copyright year to 2022Kai Köhne2022-01-061-1/+1
| | | | | | | | | | | | | | | | Task-number: QTBUG-99345 Change-Id: If6f1d6f9f82a601f8e2b6d36650d6e737518aa60 Reviewed-by: Paul Wicking <paul.wicking@qt.io> Reviewed-by: Topi Reiniö <topi.reinio@qt.io> (cherry picked from commit 6205cb161d393f96c670d57bca29fed2dcfda14c)
| * 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>
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.8' into ↵v5.15.8-lts-lgplTarja Sundqvist2022-11-115-18/+62
|\| | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: I569a2246c9e8d70430e8c5405b9f3df2218078ee
| * Doc build: fix conflicting response file with mocSamuli Piippo2021-12-011-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)
| * macOS: Hard-code NEON and SSE/SSE2 when building universal buildsTor Arne Vestbø2021-11-111-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't have the configure machinery to run two sets of arch tests, which means all the CPU features are based on the primary architecture. Like for iOS, we hard-code the feature of the second architecture, but limited to NEON and SSE. If the primary architecture is arm64, we'll miss a bunch of x86_64 features (locally I have cx16 mmx sse sse2 sse3 ssse3 sse4.1). We are also leaving out the arm64 crc32 feature. Change-Id: Idf384e413a3ae7ab2e533217db36f58dafb144e4 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| * macOS: Respect QMAKE_APPLE_DEVICE_ARCHS by building for all those archsTor Arne Vestbø2021-11-111-8/+18
| | | | | | | | | | | | | | | | | | | | 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)
| * qmake: Pick default architecture on macOS based on unameTor Arne Vestbø2021-11-111-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 whether the user passed QMAKE_APPLE_DEVICE_ARCHS to configure, and then use that to initialize QMAKE_APPLE_DEVICE_ARCHS again for user projects. 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> (cherry picked from commit f9c850cc42a5591c096e1b0d547efb93ad18f1f1)
| * macOS: Don't hard-code x86_64 as the architecture when using qmakeTor Arne Vestbø2021-11-112-6/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The qmake variable QMAKE_APPLE_DEVICE_ARCHS was added for iOS, to support universal builds, as the QT_ARCH is a single value. Since the qmake macOS builds are non-universal (at the moment), we remove the hard-coded value for QMAKE_APPLE_DEVICE_ARCHS on macOS, and let the normal architecture test resolve the arch, like on other platforms. To ensure that the following configuration tests are run with an -arch argument, we trigger a commit of the preliminary Qt configuration after running the architecture test. This is not strictly necessary, but makes it clearer what's going on during configure. The device_and_simulator configuration option was used by the iOS toolchain, and needed to be moved up in the configuration test order to not break later tests. The logic in mac/default_post.prf for both Xcode and Makefiles to add -arch flags was kept as is, based on the existing variable, to avoid too many changes to this logic. The logic in toolchain.prf was amended to make it clear and ensure that it only applies to iOS builds. macOS builds do not have this issue. Change-Id: I70db7e4c27f0d3da5d0af33cb491d72c312d3fa8 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit 9082cc8e8d5a6441dabe5e7a95bc0cd9085b95fe)
| * 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>
| * xcode: Allow automatic provisioning updates when calling xcodebuildTor Arne Vestbø2021-10-161-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>
* | iOS: Use generic simulator device for building apps via xcodebuildv5.15.7-lts-lgplTor Arne Vestbø2022-10-202-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: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* | xcode: Allow automatic provisioning updates when calling xcodebuildTor Arne Vestbø2022-10-191-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: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.7' into ↵Tarja Sundqvist2022-09-125-6/+16
|\| | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: I976ce0c3664c9953dd0019b7d76d3f603583634f
| * Android: Fix path of qmake_qmake_immediate.qrc in single_abi with qmakeAssam Boudjelthia2021-09-221-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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: Joerg Bornemann <joerg.bornemann@qt.io>
| * 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>
| * Update Android default SDK from 29 to 30Juha Vuolle2021-09-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | 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)
| * Fix .qm file name calculation in lrelease.prfJoerg Bornemann2021-09-141-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>
| * qmake: Add support for C17/C18Joerg Bornemann2021-08-301-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | 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)
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.6' into ↵Tarja Sundqvist2022-08-161-4/+23
|\| | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: Ia9164a17d80376f0a3ab9752c4a9f4dd2f0bd3d9
| * Fix linking of debug projects against release Qt on Darwin platformsJoerg Bornemann2021-06-241-4/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.5' into ↵v5.15.5-lts-lgplTarja Sundqvist2022-05-162-6/+12
|\| | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: I0cdb390124e783dc9cd832a9954baa76a0e9eb6b
| * CMake: Fix automatic default linking of static svg pluginsAlexandru Croitor2021-05-262-6/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a qmake project links to the static QSvg module, qmake will automatically link the svg plugins into the executable. This was not the case for CMake projects, due to an incorrect genex check of the QT_PLUGIN_EXTENDS property. Instead of checking against the CMAKE_MODULE_NAME value, we should check for the modules listed in the qmake PLUGIN_EXTENDS variable. Note that the CMake behavior is still off compared to the qmake one. In a qmake project, the svg plugins will only be linked if there's a QT += svg clause (find and link against svg module). If there's only a QT += gui, the svg plugins will not be linked in. In contrast, in CMake it's enough to only do find_package(Qt5Gui) without finding Svg, and that will already link in the svg plugins. This is somewhat incorrect, but shouldn't lead to any issues. Not linking at all was worse. Implementing this properly is much harder. A new bug report was filed to track that for Qt 6. Fixes: QTBUG-82037 Task-number: QTBUG-93501 Change-Id: I69715081839f9493329d12a88207daeab81218fc Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| * Fix prl generation with static dependencies take 2Michal Klocek2021-04-201-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | In the case of mulit-config we did install module pri files with the build path, which resulted in builds which uses those modules as dependencies in incorrect prl files containing also build paths. Use sed to correct pri files on install for debug and release builds also. Pick-to: 5.15.4 Task-number: QTBUG-91385 Change-Id: I3d78025acde4fa27977b9ab9ae0bf1d8e678e393 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.4' into ↵Tarja Sundqvist2022-04-075-7/+31
|\ \ | | | | | | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: I3d223d54a832c8365fec4b399550da79f4c1abbb
| * | Fix prl generation with static dependencies take 2Michal Klocek2021-04-211-0/+17
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the case of mulit-config we did install module pri files with the build path, which resulted in builds which uses those modules as dependencies in incorrect prl files containing also build paths. Use sed to correct pri files on install for debug and release builds also. Task-number: QTBUG-91385 Change-Id: I3d78025acde4fa27977b9ab9ae0bf1d8e678e393 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit c4cc615b4d30a08999659ca63ac2f50d59bc72f7) Reviewed-by: Michal Klocek <michal.klocek@qt.io>
| * qmake: Improve error message when detecting macOS platform SDK upgradeTor Arne Vestbø2021-04-092-4/+11
| | | | | | | | | | | | | | | | Task-number: QTBUG-85546 Change-Id: I2bce9d22ad826fa73fa4dbfd03c9b1d404c57859 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> (cherry picked from commit fca543bcdeb2cb5c6c478e96a7d75010f637d784) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| * Only embed launch screen when building an appChristoph Keller2021-04-091-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". Task-number: QTBUG-71035 Change-Id: I5c028e687f16e046b12156c1a8a89540deba4d3b Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> (cherry picked from commit 9c24ad3b94cb8c67468e947f02dd1f9aaf246085)
| * Fix condition that adds resources for each Android ABIAlexey Edelev2021-04-081-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | If we already have the list of Android ABI in BUILDS, it's not necessary to generate extra resource while Qt build. Amends: 58556afb6960b442f88649b550aaec8e1a04338b Fixes: QTBUG-88031 Change-Id: I344efe6c477461659a360281da59c4abeae18fc2 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit 72d1393c1d88a70c337e87c661bbeefe46346d23)
* | Revert "Update commercial license headers to \bin, \mkspecs, \qmake"Tarja Sundqvist2021-03-254-87/+87
|/ | | | | | | | | | | This reverts commit 84a4f1281d5d687bfdadafea9c5618780b1663b6. Revert of commercial license headers is required for Qt 5.15.3 opensource release. Task-number: QTBUG-91108 Change-Id: I097a2ac67d1747cb5f63a95b1e1b9458a7cdb703 Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
* macOS: Only check SDK major version for compatibilityTor Arne Vestbø2021-02-021-2/+2
| | | | | | | | | | The macOS SDKs now follow the same major/minor version scheme as iOS, where the major version is bumped for each OS release. Change-Id: I021421a9c58bb1ae64bc0c63b4215f14e4ada358 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> (cherry picked from commit af0fa5cffe55b3ce9364fa2e6f4b76bc581c08c9) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-15 10:43:21 +0000