summaryrefslogtreecommitdiffstats
path: root/mkspecs
Commit message (Collapse)AuthorAgeFilesLines
* Add preliminary support for Qt for visionOSTor Arne Vestbø2024-04-187-9/+127
| | | | | | | | | | | | | | | | | | | | | | Qt already runs on Vision Pro as "Designed for iPad", using Qt for iOS. This change enables building Qt for visionOS directly, which opens the door to visionOS specific APIs and use-cases such as volumes and immersive spaces. The platform removes some APIs we depend on, notably UIScreen, so some code paths have been disabled or mocked to get something up and running. As our current window management approach on UIKit platforms depends on UIWindow and UIScreen there is currently no way to bring up QWindows. This will improve once we refactor our window management to use window scenes. To configure for visionOS, pass -platform macx-visionos-clang, and optionally add -sdk xrsimulator to build for the simulator. Change-Id: I4eda55fc3fd06e12d30a188928487cf68940ee07 Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
* qmake: Improve Xcode projects for single SDK builds on Apple platformsTor Arne Vestbø2024-04-031-0/+12
| | | | | | | | | | | Xcode expects the base SDK to always be the device SDK, so we can't pass QMAKE_MAC_SDK on directly. We use the Xcode SUPPORTED_PLATFORMS setting to inform Xcode about which targets we can actually build and run for. Change-Id: I32f474a9f2016fb410225cfef1fecc6598ac6c82 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* iOS: Remove unneeded default_post.prf fileTor Arne Vestbø2024-03-221-9/+0
| | | | | | | | The qiosnsphotolibrarysupport handling is already present in the more generic features/uikit/default_post.prf Change-Id: I43c0bf426c24d7a0ff9c1324eeb22fffe8677bcf Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* cmake: Propagate Apple platform build requirements to qconfig.priTor Arne Vestbø2024-03-142-8/+0
| | | | | | | | | | | | So we don't have to maintain the requirements in two places. None of the variables removed from the qmake configs are referenced before we do load(qt_config), so this should be safe. Pick-to: 6.7 Change-Id: Iabd5884a2fd1c4b1cd7b44416bebb2624050229e Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Correct license for tools filesLucie Gérard2024-03-054-4/+4
| | | | | | | | | | | | According to QUIP-18 [1], all tools file should be LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 [1]: https://contribute.qt-project.org/quips/18 Pick-to: 6.7 Task-number: QTBUG-121787 Change-Id: Icd5d5be2e04819617e68ff142924de1773bebbad Reviewed-by: Kai Köhne <kai.koehne@qt.io>
* wasm: update Emscripten to 3.1.50Lorn Potter2024-02-211-1/+1
| | | | | | Pick-to: 6.7 Change-Id: Id147a927420a1743ef1cfd952b36e90ac0c319dd Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
* Correct licenseLucie Gérard2024-02-204-4/+4
| | | | | | | | | | | | | According to QUIP-18 [1], all build system files should be BSD-3-Clause. The files in this patch are part of the build system. [1]: https://contribute.qt-project.org/quips/18 Pick-to: 6.7 Task-number: QTBUG-121787 Change-Id: I9a79fb04971b117515ed16b3978435ad8ef0e31f Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* QMake: Fix quoting of WASM's ASYNCIFY_IMPORTS linker optionJoerg Bornemann2024-02-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | WASM projects failed to link on Windows if "CONFIG += silent" was specified in the .pro file and the build environment did not contain sh.exe. In that case, QMake prepends "@echo linking && " to the link command. The mingw32-make tool then considers this command as "complex command" and runs it through either sh.exe or cmd.exe, depending on whether sh.exe is found in PATH. If cmd.exe is used, the single quotes around the ASYNCIFY_IMPORTS option are passed verbatim to em++. Then em++ thinks 'ASYNCIFY_IMPORTS=qt_asyncify_suspend_js,qt_asyncify_resume_js' is an input file. That file is of course non-existent, and linking fails. Remove the single quotes around the linker option. They are not necessary. Pick-to: 6.5 6.6 6.7 Fixes: QTBUG-122192 Change-Id: Id362b51ac787f7f235bcb3d9102c5dee66ce5768 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
* Bump iOS minimum deployment target to iOS 16Tor Arne Vestbø2024-02-141-1/+1
| | | | | | | | | | | According to https://developer.apple.com/support/app-store/ iOS 16 and 17 together cover 89% of devices that transacted on the App Store on February 4, 2024. And by the time Qt 6.8 is ready, iOS 18 will likely be out or close to being released. Change-Id: Ice853d0136ee4c697d61add68a996548ac44a0ce Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Remove QT_READDIR_R macro from qplatformdefs.hAhmad Samir2024-02-065-13/+0
| | | | | | | | | | | | | | | | | | | readdir_r() has been deprecated since glibc-2.24; all usage of QT_READDIR_R in qtbase has been ported to readdir() since 2016 4b6784b49c6dcf0add9ec0cbb4ad97cd191c2aa3 (which explains in details the reasons behind the deprecation). What's left is the QT_READDIR_R, user code that still uses it, can switch to readdir_r() (which is not advisable). [ChangeLog][QtCore] Removed QT_READDIR_R macro; readdir_r() has been deprecated since glibc-2.24 and it's recommended to use readdir() instead. For more details see: https://man7.org/linux/man-pages/man3/readdir_r.3.html Change-Id: Icca2dca7e696533dcb983a82ba97a13baadcf015 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Bump macOS minimum deployment target to 12 (Monterey)Elias Toivola2024-02-011-2/+2
| | | | | | | | | | macOS 11 is at its end-of-life and no longer supported by Apple. It should be dropped from dev (Qt 6.8). Task-number: QTQAINFRA-6009 Change-Id: Ib5fc5adbc13eb08e4603b226b9d7748417765b15 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* wasm: set MAXIMUM_MEMORY to 4GBMorten Sørvig2023-12-201-0/+6
| | | | | | | | | | | | This increases the maximum available memory from 2GB (Emscritpten default) to 4GB, which is the 32-bit wasm max. Add QT_WASM_MAXIMUM_MEMORY qmake/cmake option for overriding. Pick-to: 6.7 Change-Id: I6257fc919a749412c4ba1e0f939996c6057ce314 Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
* wasm: Don't suppress exceptions during main()Morten Sørvig2023-12-201-2/+2
| | | | | | | | | | | | | | | | | If there's e.g. an infinite loop during main() that would previously result in a blank page, but not error message. The expected case is that we would get a RangeError exception, but that exception never reaches the catch handlers in qtloader.js. Work around this by setting noInitialRun, followed by calling main manually. We then need to handle the case where the app.exec() workaround throws, which should not trigger an error. Pick-to: 6.7 Change-Id: Ia8431279308770981316cd168e4316341bfb2531 Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
* Android: bump Android target API level to 34Rami Potinkara2023-11-301-1/+1
| | | | | | | | Bumped on network related .gradle files too. Fixes: QTBUG-119145 Change-Id: I95f70e6cda1aad7a6bd7246c623eb6f143a829cb Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
* CMake: Warn when configuring Qt with an unsupported Apple SDK or XcodeAlexandru Croitor2023-11-291-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The warnings are shown when configuring any Qt submodule or top-level. The warnings are NOT shown when configuring a user project with CMake. Opt out CMake cache variables can be set to silence any of the warnings: - QT_NO_APPLE_SDK_AND_XCODE_CHECK - QT_NO_APPLE_SDK_MIN_VERSION_CHECK - QT_NO_XCODE_MIN_VERSION_CHECK - QT_NO_APPLE_SDK_MAX_VERSION_CHECK The warnings can be upgraded into errors by configuring with -DQT_FORCE_FATAL_APPLE_SDK_AND_XCODE_CHECK=ON The platform version requirements that qtbase specifies in .cmake.conf are saved in Qt6ConfigExtras.cmake so that they can be used when configuring other non-qtbase submodules. The code is added to the public CMake files, so that in the future we don't need to move code around if we enable the checks for public CMake projects as well. The version extraction helpers were moved out of QtAutoDetectHelpers into QtPublicAppleHelpers. Task-number: QTBUG-119490 Change-Id: Ic840e1013aeb607bf23247a9cb43471dde802e9d Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Amir Masoud Abdol <amir.abdol@qt.io>
* QMake: Make 'entrypoint' and 'qt' CONFIG values order-independentJoerg Bornemann2023-09-292-10/+12
| | | | | | | | | | | | | | | | | If users have CONFIG += qt in their .pro file then the project won't link if the platform requires the entrypoint module. This is because qt.prf is loaded before entrypoint.prf in this situation. Make the CONFIG values 'entrypoint' and 'qt' independent of their order by embedding the content of entrypoint.prf into qt.prf. Pick-to: 6.5 6.6 Fixes: QTBUG-117674 Change-Id: I72a3c9be023a73d70454533262544a4211cb6974 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
* Android: bump Android target API level to 33Assam Boudjelthia2023-09-231-1/+1
| | | | | | | | | To follow latest Play Store requirement. Pick-to: 6.6.0 6.6 6.5 Fixes: QTBUG-112637 Change-Id: I1ef4f8b639f4b0cc759a2363b7b9b9864b159509 Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
* Remove remnants of Qt for Native Client (NACL)Tor Arne Vestbø2023-09-238-97/+0
| | | | | | | | | The project has been superseded by Qt for WebAssembly and was never supported in Qt 6. Pick-to: 6.6 6.5 Change-Id: I36682cfe3ce6adac76a307b0faba97dcb7c655cc Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* qmake: Bump supported macOS SDK version to 14 (Sonoma)Tor Arne Vestbø2023-09-181-1/+1
| | | | | | Pick-to: 6.6 6.6.0 6.5 6.5.3 Change-Id: I49f97e844729f2b99af6efad00d024db13050ea1 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* qmake: Don't error out if QMAKE_DEFAULT_LIBDIRS is empty on macOSTor Arne Vestbø2023-09-131-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | The new linker in Xcode 15 doesn't provide any default linker or framework paths when requested via -v, but still seems to use the default paths documented in the ld man page. We trust that linker will do the right thing, even if we don't know of its default linker paths. We also need to opt out of the default fallback logic to set the libdirs to /lib and /usr/lib. This may result in UnixMakefileGenerator::findLibraries finding different libraries than expected, if additional paths are passed with -L, which will then take precedence for qmake, even if the linker itself will use the library from the SDK's default paths. This should hopefully not be an issue in practice, as we don't turn -lFoo into absolute paths in qmake, so the only risk is that we're picking up the wrong prl files and adding additional dependencies that the lib in the SDK doesn't have. Pick-to: 6.6 6.6.0 Change-Id: I2347b26e2df0828471373b0e15b8c9089274c65d Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* undef READ and WRITE on VxWorksŁukasz Matysiak2023-08-311-0/+7
| | | | | | | | | | On VxWorks READ is defined as 0 and WRITE as 1 this causes issues with moc and Q_PROPERTY that are manifested as parse errors Task-number: QTBUG-115777 Change-Id: I9ea971507fa30390affb8b6865bfde04e8fd5a7d Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Support PRELOAD var substitution for WASM main html with qmakeMikolaj Boc2023-07-271-1/+6
| | | | | | | | | | The PRELOAD variable in wasm_shell.html wouldn't get substituted with preload list when using qmake. Do that as it is done in cmake. Fixes: QTBUG-115507 Change-Id: I3c659626dc6fa6f4fdf9e31bd62b87fc6a7d8bbe Reviewed-by: Lorn Potter <lorn.potter@gmail.com> Reviewed-by: Piotr Wierciński <piotr.wiercinski@qt.io>
* Fix compilation of qfilesystemengine on VxWorksJacek Poplawski2023-07-271-0/+2
| | | | | Change-Id: I533f262bf6624008d216d96aa29ae2dfc4ba9195 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Use a sanitized JS export name for WASM modules (qmake)Mikolaj Boc2023-07-271-2/+4
| | | | | | | | | | | | | Previously, a target name with a JS special character (like, -, for example), would lead to an invalid export name being generated for WASM modules. Sanitize these by replacing any non-alphanumeric character with underscores, as is done for feature names. This is a qmake version of 58a47edda15fe365220f8502ad42a7bd09bf83b7 Fixes: QTBUG-115506 Change-Id: I7c84076be54da91cf0f707c1613afc382acdcb83 Reviewed-by: Lorn Potter <lorn.potter@gmail.com> Reviewed-by: Piotr Wierciński <piotr.wiercinski@qt.io>
* Add initial support for building for VxWorks using clangJacek Poplawski2023-07-212-0/+52
| | | | | Change-Id: I8c4538cd5582bfea69a6e1890445c4c75e6ca0d7 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fix spelling of D-Bus in the source codeIevgenii Meshcheriakov2023-07-061-1/+1
| | | | | | | | | Replace D-BUS with correct splling D-Bus in the source code, Keep the old spelling inside XML DTD declarations for compatibility. Change-Id: Ifa5d43f9fa1417431c81cf1bce0d897a966409b9 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* wasm: update emscripten to 3.1.37Piotr Wierciński2023-06-261-1/+1
| | | | | | | | Qt 6.6 will require emscripten 3.1.37 Pick-to: 6.6 Change-Id: Id036d799d5730ac8d8a5f7914d56a1ed421f9222 Reviewed-by: Mikołaj Boc <Mikolaj.Boc@qt.io>
* Make WASM export names different across modulesMikolaj Boc2023-06-202-1/+7
| | | | | | | | The export name is now ${TARGET_NAME}Entry. This can also be overridden by using QT_WASM_EXPORT_NAME, both in CMake and qmake Change-Id: I59c97ae6e22f0b2720716e9d7eff7b6b13d37ab5 Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
* wasm: add "FS" to EXPORTED_METHODSMorten Sørvig2023-06-201-2/+2
| | | | | | | | | This is required when using the preload functionality from qtloader. Pick-to: 6.6 Change-Id: Ib1bf8788b87834ba0ff80d563897040e093a16b9 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* iOS: Don't add Qt libraries to PRE_TARGETDEPS of xcodebuild MakefileTor Arne Vestbø2023-05-101-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | Support for PRE_TARGETDEPS was added for iOS applications in 53ac8094b13d52b7da8b029cf4716827241283c3, even if the Xcode generator doesn't support PRE_TARGETDEPS, by taking advantage of the glue Makefile we use to run xcodebuild. And we add our own Qt libraries to PRE_TARGETDEPS in qt.prf, as you would expect. But since Xcode supports both debug and release, we always set debug_and_release for this glue Makefile. The result is that when computing the Qt library PRE_TARGETDEPS, we fail to apply a _debug suffix from qtPlatformTargetSuffix(), since we've enabled debug_and_release. In a debug only build, this means that 'make' of the glue Makefile will fail to find the release versions of our Qt libraries. To work around this we skip adding Qt to the target deps when generating the xcodebuild Makefile, as we know these libraries are added to the target in the Xcode project. Pick-to: 6.5 6.2 Change-Id: Icafc103e34a6f83240fa8187181d885fb0172a86 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* qmake: Fix infinite make loop if RESOURCES contains nonexistent .qrcJoerg Bornemann2023-04-171-1/+1
| | | | | | | | | | | | | | | | | If RESOURCES contained a non-existent .qrc file, qmake produced Makefiles that resulted in an infinite loop when running GNU Make. Introduce a new extra compiler CONFIG value "remove_no_exist" that removes non-existent extra compiler input. This value is now used in the extra compiler that handles the RESOURCES variable. The difference to the existing CONFIG value "ignore_no_exist" is that qmake still prints a warning about the non-existent file. Pick-to: 6.5 Fixes: QTBUG-112743 Change-Id: I3293af75b75f217e1a1738b49da0af1117cfdecb Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Change android target SDK version to 31Fabio Falsini2023-03-211-1/+1
| | | | | | | | Play Store now accept only app with target SDK version set to 31 or above Change-Id: I7f7fb677798c3f2d3ce327226ac13a69f0bab442 Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* CMake: remove tests for C++17 and C11 and earlierThiago Macieira2023-03-212-23/+3
| | | | | | | | | | | | Qt requires them and will fail to build if it isn't met, so we don't need to check for its support. These were public CMake and qmake features, so to keep compatibility with existing they're hardcoded now (only done for the C++ editions and for qmake only, as that's what Qt 5 did). Change-Id: I7f354474adce419ca6c2fffd174814724f45f90b Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* wasm: set stack size to 5MB againMorten Sørvig2023-03-061-1/+2
| | | | | | | | | | | Recent Emscripten 3.1.27 reduces the stack size to 64KB, which is way to small for Qt-based applications. Restore the previous stack size (5 MB) by setting STACK_SIZE. Change-Id: I6c25e31b32dc1d551fa423655fcef4891830bcd1 Reviewed-by: Piotr Wierciński <piotr.wiercinski@qt.io> Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
* qmake: Resolve target suffix based on Qt build config for static pluginsTor Arne Vestbø2023-03-042-4/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The qtPlatformTargetSuffix() function is used in various places to determine the suffix of targets based on the config, which for macOS will result in a _debug suffix in debug mode. This becomes tricky when one project built in debug mode tries to depend on the libraries/plugins of another project (Qt) built in release, as the qtPlatformTargetSuffix() function uses the current CONFIG as input, which may be different than the QT_CONFIG (or CONFIG of whatever project is being depended on). For libraries this was fixed in 50e664835bc2130e8693364641f9aaa7133b6998 by iterating all known library paths, and trying the CONFIG suffix before falling back to release version. For plugins this was never solved, which becomes an issue when linking to static plugins, either in a fully static build of Qt, or when some of the plugins are static (permission plugins e.g.). In this situation, the user project has to have the same configuration as Qt was built with, to avoid errors like: error: no such file or directory: '~/6.x-static/qtbase/plugins/platforms/libqcocoa_debug.a' To work around this, we assume that a plugin installed into the Qt tree has the same build configuration as Qt itself, then then use QT_CONFIG as the determining factor when linking to the plugin. This still ties the build config of the plugin to the config of Qt, but relaxes the relationship to the application, allowing it to be built in either debug or release, which is an improvement to the current state. Pick-to: 6.5 6.5.0 Task-number: QTBUG-110356 Change-Id: Icee67fc01313a6c6f34178a6345ccae1b57429d7 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Remove qmake files that provide support for building Qt modulesAmir Masoud Abdol2023-02-2726-4840/+0
| | | | | | | | | | | | | | Repeating the body of the reported bug, "Building Qt modules with qmake is unsupported in Qt6 and since 6.5's switch to syncqt.cpp broken." [ChangeLog][qmake] Support for building Qt modules with qmake was removed. Pick-to: 6.5 Fixes: QTBUG-110134 Change-Id: Iee5aa5c85f7106bce742df448ec502e6cc039454 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Adjust permissions.prf plist path handlingJuha Vuolle2023-02-131-2/+3
| | | | | | | | | | | | | Few tweaks: - Remove extra closing parenthesis - Use absolute paths as the exists() checks & other plist path uses are relative to the permissions.prf location - Use the plist path with PlistBuddy instead of the variable from .pro file Pick-to: 6.5 Change-Id: I27c7f1e7044a55ff7fbd78ef1dd79c92b17e8018 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* permissions: Handle relative paths to Info.plist fileTor Arne Vestbø2023-02-071-1/+6
| | | | | | Pick-to: 6.5 Change-Id: I5fb6bd7da37392bb4a44309b4545fe158a60b3e3 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Revert "Revert "Add support for MultiABI with custom install dir of the ↵Alexey Edelev2023-02-021-0/+5
| | | | | | | | | | | | android-build"" This reverts commit d7e8d5bb1b5a9c4b21a3d824780c672eaf4e56b1. Reason for revert: Found a working solution for the issue. Change-Id: Ia720cc63ece9dfb1a24067cdd9c3d79d4edbe3be Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
* Revert "Add support for MultiABI with custom install dir of the android-build"Alexandru Croitor2023-02-011-5/+0
| | | | | | | | | | This reverts commit 979a21dc4ee0c6f483c6b55e9242a153d659ab6f. Reason for revert: Caused QTBUG-110836 Task-number: QTBUG-110836 Change-Id: I4f31018954e6bb0f4e7b6db0df76d04c0a56d9b1 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Add support for MultiABI with custom install dir of the android-buildFab Stz2023-01-301-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Right now, "multi abi builds" of android projects works only if the android-build installation doesn't use custom install dirs (INSTALL_PREFIX, INSTALL_BINDIR...) At the same time, it fixes QTBUG-106533. The patches are the same as the ones in that bugreport. Add new items to android-*-deployment-settings.json: qtDataDirectory qtLibsDirectory qtLibExecsDirectory qtPluginsDirectory qtQmlDirectory Update androiddeployqt to be able to get files from their install location BTW (fixes QTBUG-106533): Install src/android/templates into INSTALL_DATADIR Install src/3rdparty/gradle into INSTALL_DATADIR Install src/android/java files into INSTALL_DATADIR Install all jars into INSTALL_DATADIR Add missing path to target_qt.conf Update target_qt.conf to have all path. Otherwise qmake wouldn't have the path when installing the android-build with custom install dirs like INSTALL_LIBDIR & friends Add support for a new cmake variable that can be set at build time of the android projects: QT_ANDROID_PATH_CMAKE_DIR_${abi} (Name chosen as brother of QT_HOST_PATH_CMAKE_DIR) Pick-to: 6.5 Fixes: QTBUG-106533 Fixes: QTBUG-107207 Change-Id: Ia3751362ab1b5f877ecafbe02f263feac167119c Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* permissions: Don't try to read usage descriptions from non-existing plistTor Arne Vestbø2023-01-231-1/+1
| | | | | | | Task-number: QTBUG-110356 Pick-to: 6.5 Change-Id: I8078556fbe67e98af2fcfe8222a8ce097df69f08 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Android: bump minimum sdk build version QT_ANDROID_API_VERSION to 33Assam Boudjelthia2023-01-231-1/+1
| | | | | | | | | To allow using Android 13 APIs. Pick-to: 6.5 Change-Id: Ic805f1e0500ce9dee25ba28fb4ef65c7afacad65 Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* permissions: Take PlistBuddy exit code into account when reading Info.plistTor Arne Vestbø2023-01-171-3/+12
| | | | | | | | | | | | | Otherwise we might conclude that we found a usage description when PlistBuddy outputs "Error Reading File: /tmp/Info.plist" to stdout. For CMake this is not an issue as we pipe stderr to a separate variable, that contains "Cannot parse a NULL or zero-length data" in this case. Fixes: QTBUG-109967 Pick-to: 6.5 Change-Id: I9d819b6de405b88bb7d1d75c22b6f5187f26e553 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Suppress warnings from Integrity buildsJanne Koskinen2023-01-091-1/+1
| | | | | | | | | We are seeing ~200 000 compiler warnings coming from Integrity compiler not seen on other compilers. Suppress these as a hotfix reduce the load on CI. Change-Id: I9636104f07e81f9f5cf39b7fac2ac34ec2456db5 Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
* wasm: Flesh out side module and main module logic for shared buildsTor Arne Vestbø2023-01-021-0/+11
| | | | | | Task-number: QTBUG-63925 Change-Id: I9da8ca0364a4fe6c9ec4d272657e1cf726d305c4 Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
* wasm: update emscripten to 3.1.25Morten Sørvig2022-12-281-1/+1
| | | | | | | | | | | | Qt 6.5 will require emscripten 3.1.25. This is not the most recent version (3.1.27 at the time of writing), however .26 and .27 make changes to stack layout and size which require further investigation. Change-Id: Ibe285ef160d450d6b2c63a7fb71d3561b0032e37 Reviewed-by: Aleksandr Reviakin <aleksandr.reviakin@qt.io> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
* wasm: Fix qmake buildMorten Sørvig2022-12-092-3/+3
| | | | | | | | | | Add missing '\' on multiline variable assignment. Sync EXPORTED_METHODS with cmake build. Change-Id: I8c790c5f8a7bdae75d6b3e3d6e4482f6c69ecbe8 Reviewed-by: David Skoland <david.skoland@qt.io> Reviewed-by: Mikołaj Boc <Mikolaj.Boc@qt.io>
* wasm: add support for wasm64 buildLorn Potter2022-12-076-222/+250
| | | | | | | | | | | | | | This adds a new platform named wasm-emscripten-64 which sets the build and link argument -MEMORY64 You may see this warning, please ignore at your own discretion: em++: warning: -sMEMORY64 is still experimental. Many features may not work. [-Wexperimental] Fixes: QTBUG-104891 Change-Id: I8d3150d239ba72dbef5c2352e0171d6cfbe51b59 Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
* 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. Pick-to: 6.4 6.2 5.15 Fixes: QTBUG-108662 Change-Id: Ie153a50ee0c49bd4f0704b588a4e2c87a05c1063 Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-09 15:07:46 +0000