summaryrefslogtreecommitdiffstats
path: root/mkspecs/features
Commit message (Collapse)AuthorAgeFilesLines
...
* Fix attempt to use -mno-direct-extern-access with ClangThiago Macieira2022-07-201-2/+7
| | | | | | | | | Clang has the option, but spells it differently. Fixes: QTBUG-105002 Pick-to: 6.4 Change-Id: I36b24183fbd041179f2ffffd170217e82ff6d14d Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* rcc: teach qmake not to use zstd when not availableSamuli Piippo2022-07-061-0/+1
| | | | | | | | | | | | | | The zstd feature might have different values between the host and target, in which case qmake must tell rcc not to use zstd when the feature is disabled. Amends 14546d1816a877690cda71f02c275303ef42afa8 Fixes: QTBUG-103794 Pick-to: 6.4 6.3 6.2 Change-Id: Ia0378742a50e2a85f59985dea2506d3dda5f28e8 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
* CMake: disable the attempt to force SIMD on iOS simulator buildsThiago Macieira2022-06-271-9/+0
| | | | | | | | | | | This will stop working with the next commit, which merges all basic x86 SIMD intrinsics into one configure test. As a result, linking almost anything graphical on iOS (which is almost everything) causes the linker to fail with undefined references to SIMD-optimized versions that didn't get compiled. Change-Id: Ib42b3adc93bf4d43bd55fffd16c288f4104a6ccc Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* qmake/MinGW: Install separate debug info of DLLs next to the DLLJoerg Bornemann2022-06-211-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. Pick-to: 5.15 6.2 6.3 6.4 Fixes: QTBUG-86790 Change-Id: If91c356e7e7f7f4330ebc43691e414929f9beb4b Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* wasm: update emscripten to 3.1.10Lorn Potter2022-05-271-1/+1
| | | | | | | | Qt 6.4 will require Emscripten 3.1.10 Change-Id: I34d6288489b6674f6fd75134dd1855ae931c79c2 Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io> Reviewed-by: David Skoland <david.skoland@qt.io>
* macOS: Ensure proper quoting when calling otool in objc_namespace scriptTor Arne Vestbø2022-05-231-3/+3
| | | | | | | Pick-to: 6.2 6.3 5.15 Change-Id: I0c7fc40d321277103f6e80f221884cd87df6f930 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
* Use SPDX license identifiersLucie Gérard2022-05-165-181/+9
| | | | | | | | | | | | | Replace the current license disclaimer in files by a SPDX-License-Identifier. Files that have to be modified by hand are modified. License files are organized under LICENSES directory. Task-number: QTBUG-67283 Change-Id: Id880c92784c40f3bbde861c0d93f58151c18b9f1 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Lars Knoll <lars.knoll@qt.io> Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
* objc_namespace: Add support for universal binariesTor Arne Vestbø2022-04-191-19/+49
| | | | | | Pick-to: 6.2 6.3 5.15 Change-Id: If6a15c1ec27fe0e1a42764fbcd194d7806aecf0c Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* objc_namespace: Fix misspelled argument for silencing outputTor Arne Vestbø2022-04-191-1/+1
| | | | | | | Pick-to: 6.2 6.3 5.15 Change-Id: I318a57e193bd10f8dbd2b22ab173a2940ba1dad9 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
* 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. Pick-to: 6.2 6.3 5.15 Change-Id: I86192e91e55d8deb7e5c6790b327855fc0f7e594 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* qmake: Add support for C++23Joerg Bornemann2022-04-052-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. This fixes an issue with MSVC where c++latest implied the /std:c++20 compiler flag. Pick-to: 5.15 6.2 6.3 Fixes: QTBUG-102202 Change-Id: Ie00ee5793c1a649195013c8c19efc8d59cf0acc9 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* 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. Pick-to: 5.15 6.2 6.3 Fixes: QTBUG-102066 Change-Id: I023296b430aac1407c970412c5cf1010bd81589b Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* iOS: Use python3 for enumerating test target devicesAlexandru Croitor2022-03-181-1/+1
| | | | | | | | | macOS 12.3 removed python 2 Pick-to: 6.3 6.2 5.15 Fixes: QTBUG-101745 Change-Id: Ieace2623e838cf36a7a68186b0f729ff0f19299a Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* wasm: remove compiler and linker warningsLorn Potter2022-03-171-18/+24
| | | | | | | | | | | INITIAL_MEMORY and PTHREAD_POOL_SIZE are linker flags only USE_PTHREADS is both linker and compiler arguments. Also increase default INITIAL_MEMORY Pick-to: 6.3 Change-Id: Id1998efbf1d6de901f404db7e988f6cafd547a39 Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
* Enable -mno-direct-extern-access and ELF protected visibilityThiago Macieira2022-03-102-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The -mno-direct-extern-access tells the compiler and linker that references to symbols outside this ELF module mustn't be direct and must instead always go through the GOT or PLT (the PLT can additionally be disabled with -fno-plt). The ELF protected visibility tells the compiler and linker that this symbol is present in the dynamic symbol table as an export, but it cannot be interposed by another ELF module. This option is required for user code to link properly to Qt, otherwise they will get linker errors (assuming GNU binutils >= 2.39) or runtime failures (glibc >= 2.35). Both versions of glibc and binutils are older than GCC 12, so it's a safe assumption they are in use and downgrading the toolchain or libc is not supported. Adding this option to the compilation is assured for CMake and qmake-based projects. For example, all accessess to QCoreApplication::self in QtCore, after this change and with GCC 12 are relocation-free and direct: 000000000013ebf0 <QCoreApplicationPrivate::checkInstance(char const*)>: 13ebf0: cmpq $0x0,0x4f73d0(%rip) # 635fc8 <QCoreApplication::self> 13ebf8: setne %al 13ebfb: je a90fe <QCoreApplicationPrivate::checkInstance(char const*) [clone .cold]> 13ec01: ret Meanwhile, accesses to the same variable in other modules are indirect via the GOT: 66650: mov 0x876e1(%rip),%rax # edd38 <QCoreApplication::self@Qt_6> 66657: cmpq $0x0,(%rax) This replaces the -Bsymbolic and -Bsymbolic-functions (broken) functionality that Qt has been using or attempting to use since ~2006. See https://gitlab.com/x86-psABIs/x86-64-ABI/-/issues/8#note_606975128 Change-Id: Iad4b0a3e5c06570b9f5f571b26ed564aa0811e47 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* 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. Pick-to: 6.2 6.3 Change-Id: I9a5f6d6b3a3adec748cf7207ceaa6da98d053cdb Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
* 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 Pick-to: 6.2 6.3 Task-number: COIN-762 Task-number: QTBUG-92271 Change-Id: I833dfb6b0832d90a76d05ea14cd3807cb0d67ca9 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* wasm: don’t pass thread linker opts to compilerMorten Johan Sørvig2022-01-171-2/+3
| | | | | | | | | | | | Emscripten now warns against passing e.g. “ALLOW_MEMORY_GROWTH” as a compile option. Add EMCC_THREAD_CFLAGS, which gets compiler flags only. Pick-to: 6.3 Change-Id: Ifcf40c45ca75cfdfc98a12e6b9d47f34158b3407 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
* wasm: modernize pthreads optionMorten Johan Sørvig2022-01-171-1/+1
| | | | | | | | | | | Use “-pthreads” instead of “-s USE_PTHREADS=1”. This is both a compile and linker option. Pick-to: 6.3 Change-Id: Iaf7cb4ec41577fe596c3e81fda05c03fe0074c08 Reviewed-by: David Skoland <david.skoland@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
* Update copyright year to 2022Kai Köhne2022-01-041-1/+1
| | | | | | | Pick-to: 5.15 6.2 6.3 Change-Id: If6f1d6f9f82a601f8e2b6d36650d6e737518aa60 Reviewed-by: Paul Wicking <paul.wicking@qt.io> Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* 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 Pick-to: 6.2 6.3 5.15 Change-Id: I50e31c1b350cf83ce348275b467051263dea88a9 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
* wasm: remove deprecated argument for source mapsLorn Potter2021-12-131-6/+1
| | | | | | | | | -g4 was deprecated in Emscripten 2.0.17, and since we are well past that version we can safely use -gsource-map instead. Change-Id: I497155619d6320661f6be0e220b52fa7d6ca0b8e Reviewed-by: David Skoland <david.skoland@qt.io> Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
* wasm: update recommended emscripten to 3.0.0Lorn Potter2021-12-091-1/+1
| | | | | | | [ChangeLog][wasm] Recommended emscripten version is now 3.0.0 Change-Id: I9ae082509415d8f00b8e9970b730ad4a472da310 Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
* android:qmake: Fix static libraries to include the QT_ARCH suffixAlexandru Croitor2021-12-021-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When building a shared library (with qmake) in a user project targeting Android, the library gets a QT_ARCH suffix added to its name. This suffix is not added when building a static library (CONFIG += staticlib). In the context of a multi-abi android qmake build, all the arch specific static libraries would have the same name and would override each other. This happens with Qt 5.15 and it would also happen in Qt 6, but we don't support multi-abi qmake builds in Qt 6 so far. When the original fix to include the arch suffix for shared libraries was done in Qt 5, d463a63bb94d3f5c9530790541d9706490e44b3a it was likely an oversight that it was not applied to static libraries as well. The !static part of the condition was added in 72d4f0750baae1bb296341bde166f020d29c7faa . The change only handled installation responsibilities, not naming of libraries. Fix static libraries to include the arch suffix, but only in Qt 6. It's too late to fix it in Qt 5, there might be projects that rely on there not being a suffix in static library names. Adding the suffix would suddenly cause linking errors. Amends d463a63bb94d3f5c9530790541d9706490e44b3a [ChangeLog][Android][qmake] Static libraries targeting Android will now include an arch suffix when built using qmake. Fixes: QTBUG-83165 Change-Id: I6f68dcb74cec30b4c8f0bc5a819d89843e9d695e Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
* 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 Pick-to: 6.2 5.15 Change-Id: Id35da18f664e2032bae96d11b00dbfe55ce37f66 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Win32: Enable large address aware explicitlyYuhang Zhao2021-11-261-0/+2
| | | | | | | | | | | | | | | | | Large address aware is enabled by default in 64-bit compilers, but not 32-bit compilers. But Qt users may build 32-bit Qt themself, in this case large address aware is disabled in fact, and it may cause some issues. So we pass /LARGEADDRESSAWARE to the linker unconditionally to make sure large address aware is enabled for both 32-bit and 64-bit builds. Microsoft Docs: https://docs.microsoft.com/en-us/cpp/build/reference/largeaddressaware-handle-large-addresses?view=msvc-170 Change-Id: Idb2603d9ba0ba9ef4477ce1c3174b7c7e8ba76f6 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Android: bump default QT_ANDROID_API_VERSION to 31Assam Boudjelthia2021-11-121-1/+1
| | | | | | | | | To allow using Android 12 APIs. Pick-to: 6.2 5.15 Change-Id: I5e9da66c84457888ec723125d16876891232a99b Reviewed-by: Ivan Solovev <ivan.solovev@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Bump WINVER, _WIN32_WINNT and _WIN32_IE to _WIN32_WINNT_WIN10 (0x0A00)Yuhang Zhao2021-11-101-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. Pick-to: 6.2 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>
* Assume qhelpgenerator in libexec instead of binJoerg Bornemann2021-11-081-1/+1
| | | | | | Task-number: QTBUG-88791 Change-Id: I0f6dc14401e715a98322abc21da3f88e34118e27 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* Fix version number when warning about Apple platform SDK mismatchTor Arne Vestbø2021-11-031-1/+1
| | | | | | Pick-to: 6.2 5.15 Change-Id: I9b9cda0c6bb9ad527dbf4b4268c1b572aa04d164 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
* wasm: add sse2 compiler flags againMorten Johan Sørvig2021-11-021-0/+8
| | | | | | | Now with QT_FOR_CONFIG += core-private. Change-Id: Iadc61e21db6566f20c32595ef1ab83f37bc5c651 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* 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. Pick-to: 6.2 Change-Id: I0b22faa1d8d62e208d79879b822e21637bb03a3e Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* 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 Pick-to: 6.2 Fixes: QTBUG-63924 Change-Id: Ifeafae20e199dee0d19689802ad20fd0bd424ca7 Reviewed-by: Morten Johan Sørvig <morten.sorvig@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. Pick-to: 5.15 6.2 Fixes: QTBUG-77222 Change-Id: I02f9ab0dd7b8f234bcd8d0ea387927f31ca092e0 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* 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. Pick-to: 6.2.0 6.2 5.15 Fixes: QTBUG-87669 Fixes: QTBUG-95202 Fixes: QTBUG-95235 Change-Id: Ie13cccdf2fc323e8fd725a94f3aacab465fa1287 Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* Remove conditioning on Android embeddedEdward Welbourne2021-09-171-1/+1
| | | | | | | | It is no longer handled separately from Android. This effectively reverts commit 6d50f746fe05a7008b63818e77784dd0c99270a1 Change-Id: Ic2d75b8c5a09895810913311ab2fe3355d4d2983 Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
* 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(). Pick-to: 5.15 6.2 Fixes: QTBUG-79016 Change-Id: I545d1b58170cd5229007faf31c9b2c6f70ff75a6 Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
* xcode: Allow automatic provisioning updates when calling xcodebuildTor Arne Vestbø2021-09-091-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 Pick-to: 6.2 6.2.0 5.15 Change-Id: I9325bb228bdfb4d07658eff8f41798f7b5a6955c Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Update Android default SDK from 29 to 30Juha Vuolle2021-08-271-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). Pick-to: 6.2 5.15 Task-number: QTBUG-94451 Change-Id: Id7fa2fd62899a7259e365c917292c6c3ac0d2b0d Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
* qmake: Add support for C17/C18Joerg Bornemann2021-08-261-1/+2
| | | | | | | | | | | | Make it possible to select the C17/C18 standard with CONFIG += c17 or CONFIG += c18 Pick-to: 6.2 5.15 Fixes: QTBUG-96026 Change-Id: I719d22366c3efda009118d58ead173a25ed285c0 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Fix location of qtattributionsscannerKai Köhne2021-07-141-1/+1
| | | | | | | | Amends f00c63093b0313f Pick-to: 6.2 Change-Id: I3be5f7d3826c1a84bad0ecf947eecc0a351685c6 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Fix qmlimportscanner path for android deployment settingsIvan Solovev2021-06-281-1/+1
| | | | | | | Fixes: QTBUG-94527 Pick-to: 6.2 Change-Id: Iffd259caecfdfe6860ba1ab9cb21d2f164060b9a Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
* 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 Pick-to: 6.2 Change-Id: I8d641104718edb16500c6d6e3994e736fa5ddcf4 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* macOS: Respect QMAKE_APPLE_DEVICE_ARCHS by building for all those archsTor Arne Vestbø2021-06-231-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. Pick-to: 6.2 Change-Id: I83273f878022af34a3a0d0eeae8b11d781f78c49 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Allow building Qt examples with qmake in-sourceKai Köhne2021-06-121-9/+1
| | | | | | | | | | | This reverts commit c686e885c004a48c90cff300c0ad1e817e43fb99 and commit d64abf8166d362b0fdc34c7f21aa32641063c01b. We don't feature .qmake.cache/.qmake.super files anymore in the source directory, so there's no problem anymore. Change-Id: Ib820a109fbfbad70d85b0f14ef72915882217ca3 Reviewed-by: Joerg Bornemann <joerg.bornemann@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>
* Merge integration refs/builds/qtci/dev/1617809473Qt CI Bot2021-04-071-6/+4
|\
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-12 23:31:19 +0000