summaryrefslogtreecommitdiffstats
path: root/cmake
Commit message (Collapse)AuthorAgeFilesLines
* CMake: Write target architecture into module info filesJoerg Bornemann2023-03-211-1/+2
| | | | | | | | | | Store the target architecture in the module information files under the key 'built_with.architecture'. Task-number: QTBUG-111158 Change-Id: Ida4cde3b15103773824a8d9d78f082540b806736 Reviewed-by: Amir Masoud Abdol <amir.abdol@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Trace: Make Q_TRACEPOINT publicAntti Määttä2023-03-211-2/+2
| | | | | | | | | | Allows sharing tracepoints between modules so that they can share one trace group. Pick-to: 6.5 Change-Id: I8de6da6beef02b34700cc2ecb1fad0e72a00b7e0 Reviewed-by: Janne Koskinen <janne.p.koskinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* CMake: Write Qt's namespace into module info JSON filesJoerg Bornemann2023-03-201-0/+4
| | | | | | | | | | If Qt was configure with QT_NAMESPACE set, store that in the module information files under 'built_with.namespace'. Task-number: QTBUG-111158 Change-Id: I273309cb263c64f801dbb7238440336d7afa635e Reviewed-by: Amir Masoud Abdol <amir.abdol@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Centralize copyright information for QtKai Köhne2023-03-202-1/+7
| | | | | | | | | Maintain one central place - .cmake.conf - for information about Qt's copyright. Pick-to: 6.2 6.5 Change-Id: Ibcbce4313eba9660d459061b0ad00307e267b8f7 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Update Copyright year to 2023Kai Köhne2023-03-201-1/+1
| | | | | | Pick-to: 5.15 6.2 6.5 Change-Id: I8812bf2523ccb715407181aec6aebf2034c8ff84 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Fix an issue with passing NO_UNITY_BUILD_SOURCESAmir Masoud Abdol2023-03-156-15/+40
| | | | | | | | | | Amend 31518f1a4e3c4a7c77ae2e008e903a849ba75dd6 Amend 360293623094a31586981206e59c92aa6235163d Pick-to: 6.5 Task-number: QTBUG-109394 Change-Id: Ibb2fd881c02b6496f06b8b623fa6009358755a26 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Improve the internal handling of unity buildAmir Masoud Abdol2023-03-145-18/+28
| | | | | | | | | | | | | | | | | | | - Removed the NO_UNITY_BUILD argument from commands that disable it by default. - Add a warning in case NO_UNITY_BUILD or NO_UNITY_BUILD_SOURCES is being used where it is already disabled, e.g., qt_internal_add_test - Exclude all sources of a target from unity build if NO_UNITY_BUILD is set on the target. This sounds a bit harsh, but I have noticed that sometimes the same source file can be included somewhere else, and some unexpected collision may occur. - qt_examples_build_end excludes all its examples from the unity build. - qt_build_test now sets the CMAKE_UNITY_BUILD to OFF before configuring the tests, and restore its value when done. Pick-to: 6.5 Task-number: QTBUG-109394 Change-Id: Ia42e7dd5a5bfb151db241deb639325720fd91eec Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* CMake: Pass CMAKE_EXE_LINKER_FLAGS to project-based try_compileAlexandru Croitor2023-03-141-0/+1
| | | | | | | | | | | | | | CMake does it for non-project-based try_compile calls if the CMP0056 policy is set to NEW. That was introduced in CMake 3.2, thus set it unconditionally. The use case is to pick up custom -rpath-link paths when cross-compiling. Pick-to: 6.4 6.5 Change-Id: I726b90267dd46de116052b5b7f19b9354a568200 Reviewed-by: Dimitrios Apostolou <jimis@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Skip also QML tests in submodules when batching is onMikolaj Boc2023-03-131-1/+1
| | | | | | | | | | This should be handled later ideally, for now we should skip and QML tests targets are still being produced, which leads to errors on WASM. Task-number: QTBUG-109786 Change-Id: I3d0d1f3115e324c7a0cb036e972226310294b216 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Adapt qt_process_qlalr for test batchingMikolaj Boc2023-03-131-0/+9
| | | | | | | | | | Calling qt_process_qlalr with a skipped/batched target name results in an error. Do the same as for other helper functions and handle these two cases. Task-number: QTBUG-109786 Change-Id: I774b148989a25d01bdf724e69a722aae132389ee Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Do not batch standalone tests; add an option to batch themMikolaj Boc2023-03-131-8/+16
| | | | | | | | | | Tests generated with qt-cmake-standalone-test will now not be batched by default. Defining the QT_BATCH_STANDALONE_TESTS environment variable will make the build system batch them. Fixes: QTBUG-111226 Change-Id: I9f01c662e22f8ffdd33e1c4d82619db0689fecc7 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Avoid error with test helper when test batch is missingMikolaj Boc2023-03-131-2/+2
| | | | | | | | | | | | | | | | qt_internal_add_test_helper will fail if a test batch is missing and batching is enabled. It will now copy to the parent binary directory as without batching for simplicity, as this happens when batched tests are skipped. One consequence could be that when the first test specified has the NO_BATCH argument, this will incorrectly install the helper, but helpers still need extra work to function properly, so for now we just make it compile. Task-number: QTBUG-109786 Change-Id: Ib307ae79799422c2a4102885aa007ef043835e50 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Make sure that all dependencies are found before creating tool targetsAlexey Edelev2023-03-131-5/+11
| | | | | | | | | | | | The result of dependency lookup is not taken into account when evaluating tool packages. Check for <ToolPackage>_FOUND before creating the tool targets that belong to the tool package. Adjust the tool package lookup that the dependencies always affect the lookup result even if we avoided creating targets by setting QT_NO_CREATE_TARGETS. Pick-to: 6.5 6.5.0 Change-Id: Ia95c9c71370becc639ed8a9db026aed2f93959b4 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* SQL/IBASE: also search in firebird subdirChristian Ehrlicher2023-03-121-0/+1
| | | | | | | | | Firebird has it's include files in <include>/firebird so we should also search there. Pick-to: 6.5 6.2 Change-Id: Ief57abbfd6973ab9077abc1a1a2791a62ce4102a Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Prefer the shared version of libzstd over the static oneLisandro Damián Nicanor Pérez Meyer2023-03-081-3/+3
| | | | | | | | This is related to QTBUG-110978, but not a complete fix. Task-number: QTBUG-110978 Change-Id: I91b757addde8213ba3d356a590f6e4cf68187c31 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Make manual tests use the usual wasm_shell.htmlMikolaj Boc2023-03-071-0/+2
| | | | | | | | | | | | Manual tests are supposed to display UI and be assessed manually, but currently they use the auto test runner by mistake. Use the normal wasm shell to fix this and make them work like usual applications. Fixes: QTBUG-111753 Change-Id: I9d3c0ad56e913b73737c5b72087e82980989d8b8 Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Allow building with llvm-clang in macOSKuntal Majumder2023-03-061-1/+1
| | | | | | | | | | Supressing the linking warnings on macOS are relevant when we are using AppleClang and not upstream Clang. The provided arguments do not apply to llvm-ar and llvm-ranlib. Change-Id: I8b664c01802b47077eb0ab80dab7681ee0bfcaa9 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* CMake: Relax example dependencies to be per-repoAlexandru Croitor2023-03-062-2/+34
| | | | | | | | | | | | | | | | | | | | | | | | When doing a top-level build with ExternalProject examples, it doesn't make sense to make qtbase examples depend on e.g. qtdeclarative plugins. Instead the qtbase example should only depend on plugins built in qtbase. Create per-repo custom targets that depend on all plugins built within that particular repo. Create an additional per-repo target which depends on all plugins built in that repo, as well as plugins from dependent repos. Use the latter as a dependency for examples built as part of the current repo. Repo dependencies are parsed from dependencies.yaml. Pick-to: 6.5 Fixes: QTBUG-110913 Change-Id: I149860cc549caf53271c9ea296eb7bac2a663715 Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> Reviewed-by: Amir Masoud Abdol <amir.abdol@qt.io> 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>
* Align qt_internal_add_manual_test with qt_internal_add_testAmir Masoud Abdol2023-02-281-107/+72
| | | | | | | | | | | | | They now share their implementation. Manual tests can be created by passing the MANUAL arguments to the qt_internal_add_test as well. Pick-to: 6.5 Fixes: QTBUG-111382 Change-Id: I1c207b7e4a67526554df1ee43fe032bb20fc92fa Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Matthias Rauter <matthias.rauter@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Skip non-qtbase tests on CoinMikolaj Boc2023-02-241-9/+16
| | | | | | | | | | The previous attempt failed as target coin configuration doesn't use superbuild. Skip the tests based on the TESTED_MODULE_COIN environment variable Task-number: QTBUG-109786 Change-Id: I0dbe6ff64ca4a2e81fef377865ef4e99b58c5eb2 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Fix a typoAmir Masoud Abdol2023-02-231-1/+1
| | | | | | Pick-to: 6.5 Change-Id: I13c344113c2e924dbe43995affe9b1aa3647f2aa Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
* CMake: Fix position independent code linker flags not being setJoerg Bornemann2023-02-231-0/+4
| | | | | | | | | | | | | | | | | We set CMAKE_POSITION_INDEPENDENT_CODE to ON and require CMake 3.16. This sets CMP0083 to NEW and should pass -fPIE to linker calls as well. However, the PIE-enabling flag is not passed to the linker unless we call check_pie_supported(). This behavior is documented in CMake's CMP0083 documentation page. [ChangeLog][CMake] Qt tools are now built with position independent code even with Unix toolchains where this is not the default, for example clang. Pick-to: 6.5 6.4 6.2 Change-Id: I1d98e0ea7063a76e3fddc94d6555c6eaf14c7885 Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
* Add support for evaluating genexes when exporting custom target propsAlexey Edelev2023-02-213-0/+161
| | | | | | | | | | | | | | Properties specified in EXPORT_PROPERTIES have their values exported verbatim, without evaluating generator expression they might contain. This limitation is removed by the introduced functions. They collect properties that needs to be exported and evaluate generator expressions inside the properties using file(GENERATE) before exporting them. The functions generate the ExtraProperties.cmake file that contains set_property calls with exported properties and corresponding values. Change-Id: If32c30a82a62e8bd48bb91f3df21ff2ad8d07243 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Revert "Avoid mapping BUILD_TESTING to QT_BUILD_TESTS"Alexey Edelev2023-02-211-0/+1
| | | | | | | | | | This reverts commit e3ecabad228369bfc6dc82085446d7acc05ef45a. Reason for revert: This breaks the CTest internal switches. So it's better to disable testing directly in submodule. Change-Id: Ia93dc3bb0a3a34021c8e2d6c3d292e3a4909bef5 Reviewed-by: Amir Masoud Abdol <amir.abdol@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Add the QT_INTERNAL_CONFIGURE_FROM_IDE optionAlexey Edelev2023-02-211-0/+10
| | | | | | | | | | | | | | | This switch should help switch off some time consuming operations that make sense only whe configuring Qt project from IDE. The switch is INTERNAL and depends on environment variables defined by IDE application when running cmake: - Qt Creator, detected by QTC_RUN environment variable - CLion, detected by CLION_IDE environment variable - Visual Studio Code, detected by VSCODE_CLI environment variable Pick-to: 6.5 Change-Id: I44086376109a8af8ebb7ecd8bf64dc34f0631527 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Set 32 as the default batch size for unity buildAmir Masoud Abdol2023-02-211-1/+1
| | | | | | | Pick-to: 6.5 Task-number: QTBUG-109394 Change-Id: I4497d1abc85578649f03fc8ae4916f56e4f1f351 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* A QtSql driver for Mimer SQLFredrik Ålund2023-02-201-0/+54
| | | | | | | | | | | | | | | | | The QtSql for Mimer SQL sqldriver makes it possible to work with the Mimer SQL database on different plattforms. There are drivers for several other databases in QtSql and a driver for Mimer SQL will benefit many users. To build the Mimer SQL driver, download Mimer SQL from https://developer.mimer.com [ChangeLog][QtSql] Added a QtSql plugin to work with the Mimer SQL database Fixes: QTBUG-111219 Change-Id: Id6ba5de4de01189d0516ffbfa89efcb0d013115f Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Revert "Add the NO_CMAKE_PACKAGE_REGISTRY option forwarding to qt_find_package"Alexey Edelev2023-02-171-1/+1
| | | | | | | | | This reverts commit 545400addd7935c87ec79596ac3010b4f9016a84. Reason for revert: Adding NO_CMAKE_PACKAGE_REGISTRY doesn't resolve the initial issue. So reverting this change as redundant. Change-Id: I284600d6f0e0f2408a7a8b31827251dad4c73eba Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Revert "CMake: Fix configure -no-rpath"Joerg Bornemann2023-02-151-15/+6
| | | | | | | | | | | | | | | | | | | | | This reverts commit 854986836a581da694d169744e5487c5ce5f44bf. This reverts commit 392d9a54194d06e96bfebdaf081aa6c9787e33ab. Turns out that enabling this option is now breaking the Qt build, because tools that are called by the Qt build cannot run anymore due to the lack of rpaths. Before, QT_DISABLE_RPATH was simply turning off Qt's additional rpaths but left CMake's rpath defaults intact. To implement a working -no-rpath switch we must add Linux and macOS code paths to _qt_internal_generate_tool_command_wrapper and set LD_LIBRARY_PATH/DYLD_LIBRARY_PATH and friends. Pick-to: 6.5 Fixes: QTBUG-110816 Change-Id: I021d5e6cd775cbe5b2411d6771ab2545cb04f799 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* Add the NO_CMAKE_PACKAGE_REGISTRY option forwarding to qt_find_packageAlexey Edelev2023-02-151-1/+1
| | | | | | | | | | | | | | | | | | Allow forwarding the NO_CMAKE_PACKAGE_REGISTRY option to the find_package call from qt_find_package. When we look for host tool packages the package dependencies are recorded in the cmake package registry. This leads to the situation when the lookup retry will use the package that is already found in host path instead of looking the right one in target paths. Adding the 'NO_CMAKE_PACKAGE_REGISTRY' to the qt_find_package calls suppresses records in cmake package registry and starts a clean search using target paths. Task-number: QTBUG-111140 Pick-to: 6.5 Change-Id: I97ce1755b2f8e3413f1b0276fe26568b2f5efe33 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Avoid mapping BUILD_TESTING to QT_BUILD_TESTSAlexey Edelev2023-02-101-1/+0
| | | | | | | | | | | This leads to unwanted side issues such as building and running third party component tests. The option should be enabled explicitly by user instead. Fixes: QTBUG-111091 Change-Id: I8942db2bd089ad2a39a70627bfce8314b101ecb8 Reviewed-by: Kai Köhne <kai.koehne@qt.io> Reviewed-by: Amir Masoud Abdol <amir.abdol@qt.io>
* Remove "Configuration summary shown below" statement when it is not trueAmir Masoud Abdol2023-02-101-19/+19
| | | | | | | | | Cleanup the generated message regarding the configuration summary. Also moved the flushing into the helper function. Pick-to: 6.5 Change-Id: I45728ac5b43613f002b6d5b07b9ad037416c4fff Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
* Improve FindWrapRt, and SHM detectionAmir Masoud Abdol2023-02-101-5/+19
| | | | | | | | | | | | | | | | | | | | Apparently, more and more librt functionality are being moved to glibc these days, e.g., clock_gettime, clock_getres, clock_settime, clock_getcpuclockid, clock_nanosleep. As Thiago mentioned, in face, all librt functions are moving into glibc, but unlike the clock_* functions that I can see are ported from 2.17+, I cannot find out when and what functions are already ported. So, here, I added a second test which tries to explicitly look for shm_* functions, if they are there, as well as the clock_* function, then we are more confident that we actually have a useful the libRt in the system. Also, making the FEATURE_posix_SHM depends on UNIX. Pick-to: 6.5 Fixes: QTBUG-111049 Change-Id: I08b7f4656ecd9313b552fb05ca7096f5b987b95a Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Tracepointgen: Parse metadata from include filesAntti Määttä2023-02-101-1/+1
| | | | | | | | | | | | | | The tracepointgen tool needs to know the enumeration/flag names and values in order to generate metadata for the tracepoints in order to pass this information when tracing. Currently the metadata needs to be provided to the tracepointgen by hand. This implements metadata parsing from header files. Task-number: QTBUG-110598 Pick-to: 6.5 Change-Id: Ibb2cc6e724fd2defca4e301af2285b0fdbe8e7f7 Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* CMake: Fix directory scoping issue for qt6_generate_deploy_scriptJoerg Bornemann2023-02-091-3/+20
| | | | | | | | | | | | | | | | | | | | | | Consider a Qt target created in a subdirectory and a call to qt6_generate_deploy_app_script(target) in the parent directory. Once qt6_generate_deploy_script (called by qt6_generate_deploy_app_script) is run, the target has already been finalized. However, qt6_generate_deploy_script needs to run before finalization, because: - qt6_generate_deploy_script marks the target as to be deployed - the finalizer generates plugins information only if the target was marked to be deployed Fix this in qt6_generate_deploy_script by checking whether the target was already finalized. In that case, generate the plugin deployment information right away. Pick-to: 6.5 Fixes: QTBUG-109741 Change-Id: Idf60f9e21f038c1a33843177d9299230857ee70b Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Add -unity-build, and -unity-build-batch-size to configureAmir Masoud Abdol2023-02-094-0/+20
| | | | | | | | | | | If -unity-build-batch-size is not given, we default to CMake's default which is 8. In QtSetup.cmake, we explicitly set the default to avoid having it set to OFF in case it is missing, just to make sure that we don't get any unintended behavior. Task-number: QTBUG-109394 Change-Id: I19849e9baa507b64fb23847c740e20a7adc61b8f Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Add some utilities for UNITY_BUILDAmir Masoud Abdol2023-02-0812-6/+96
| | | | | | | | | | | | | | | | | | | | | | | | | - The following commands accepts NO_UNITY_BUILD, and NO_UNITY_BUILD_SOURCES arguments to opt out of the unity build, and to exclude some source files from unity build, respectively. - qt_internal_add_executable - qt_internal_add_module - qt_internal_add_plugin - qt_internal_add_tool - qt_internal_extend_target - qt_internal_add_common_qt_library_helper - qt_internal_add_cmake_library - qt_internal_add_simd_part - Unity build is disabled by default in these: - qt_internal_add_test - qt_internal_add_test_helper - qt_internal_add_benchmark - qt_internal_add_3rdparty_library - qt_update_ignore_pch_source also excludes the files from unity_build Pick-to: 6.5 Task-number: QTBUG-109394 Change-Id: I5d0e7df633738310a015142a6c73fbb78b6c3467 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Add simple project generation based on existing source filesAlexey Edelev2023-02-084-0/+242
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce the qt-cmake-create script. The script generates the simple CMakeLists.txt based on the source files located in the current or specified directory. The initial version can generate a CMake code for the following file types: - .c .cc .cpp .cxx .h .hh .hxx .hpp - generates the qt_add_executable call with prerequisites. - .qml .js .mjs - generates the qt_add_qml_module call with prerequisites. - .ui - adds the found ui files to the existing executable. Requires C++ files be present in the directory too. - .qrc - generates the qt_add_resources call and adds the resources to the existing executable. Requires C++ files be present in the directory too. - .proto - generates qt_add_protobuf call with prerequisites. The QtInitProject.cmake script contains the 'handle_type' function that allows extending the script capabilities and establish simple relation chains between the file types. Note: The initial implementation doesn't deal with sub-directories, so all files from sub-directories will be added to and handled in the top-level CMakeLists.txt file. This can be extended by user request. Task-number: QTBUG-104388 Change-Id: I5abd9e07da109e867ff95986572ed2bf02ef9d3d Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* CMake: Show a message when configuring examplesAlexandru Croitor2023-02-071-0/+1
| | | | | | | | | | | This somewhat indicates the progress of configuring a specific repo and the slower period of time when configuring examples in-tree. Pick-to: 6.5 Change-Id: I643536c4ebc865933730b7af2a1d0c56bbbf2912 Reviewed-by: Amir Masoud Abdol <amir.abdol@qt.io> Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
* Revert "Revert "Add support for MultiABI with custom install dir of the ↵Alexey Edelev2023-02-022-1/+14
| | | | | | | | | | | | 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-012-14/+1
| | | | | | | | | | 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>
* Update qt_policy and add documentationAmir Masoud Abdol2023-01-301-0/+2
| | | | | | | | | | | | | | | | - If no version specified, policy version is set to 6.0.0, therefore warnings will be shown, encouraging users to set a policy. - Update qt_policy() documentation - Update qt_standard_project_setup() documentation - Update the policy warning message - Added the missing comment to clarify the extra_code region Pick-to: 6.5 Task-number: QTBUG-96233 Change-Id: I8358fdeb880a34c96f13fc2a6cbef6afe048c4d6 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* qnetworkproxy_mac: use API available both on iOS and macOSTimur Pocheptsov2023-01-301-0/+1
| | | | | | | | | | | | | | | To extract system proxies, the one we used previously, was not available on iOS and thus we could not obtain system proxies there. Support is limited - no such things, as SOCKS/FTP/etc. proxies, only PAC (auto configuration), and HTTP/HTTPS. There are no keys to extract info about HTTPS, so instead we'll use CFNetworkCopyProxiesForURL ( looks like this enables exclusion lists (which are hidden) functionality and apparently from the system point of view HTTP/HTTPS are the same. Fixes: QTBUG-39869 Change-Id: I73af719a2e2b5cded706e6b3faa4b8eaa879352b Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* Add support for MultiABI with custom install dir of the android-buildFab Stz2023-01-302-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* headersclean: Check fno-operator-namesFabian Kosmale2023-01-261-0/+1
| | | | | | | | | | KDE Frameworks tests this in one build configuration. Verify that we do not break it in public Qt headers. Task-number: QTBUG-110585 Change-Id: I5c976d00d7b1aba026e99acb9bad176103e23b0b Reviewed-by: Marc Mutz <marc.mutz@qt.io> Reviewed-by: Kai Köhne <kai.koehne@qt.io>
* Fix configure -no-rpath for CMake < 3.18Joerg Bornemann2023-01-241-15/+15
| | | | | | | | | | | | | We must not set rpath-related properties on INTERFACE libraries. Move the code that sets the properties below the bail out for INTERFACE libraries. This amends commit 392d9a54194d06e96bfebdaf081aa6c9787e33ab. Pick-to: 6.5 Fixes: QTBUG-110513 Change-Id: Ie395f1482245c4522917f982d2f3bc745c0b2abc Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
* Remove the extra quote, now that we use cmake_parse_arguments(PARSE_ARGVAmir Masoud Abdol2023-01-233-10/+10
| | | | | | | | | | | | | | | The extra quote enforces the arguments to be string, and stops the COMMAND_EXPAND_LISTS within QtDbusHelpers.cmake::qt_create_qdbusxml2cpp_command from expanding it as a list. Fixes: QTBUG-110459 Fixes: QTBUG-110450 Task-number: QTBUG-99238 Change-Id: Ifddd6570c7bf8f2d1757f275d9445ce2924a93f1 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Ivan Solovev <ivan.solovev@qt.io> Reviewed-by: Alexey Edelev <alexey.edelev@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>
* Skip tests outside of qtbase on batching+superbuildMikolaj Boc2023-01-233-0/+52
| | | | | | | | | | | | | | | The batcher does not currently work properly with non-qtbase submodules. Disable them temporarily so that at least the tests in qtbase are batched. Do this from qtbase so that changes to each and every submodule are not necessary. Also, maintain a list of tests that were thus skipped. On any qt cmake internal function call that refers to such a target, identify the target as skipped and make the call a no-op. Fixes: QTBUG-109785 Change-Id: Ib0aa5d39eee8315ffd4ac62f6d1f44fe9bbf7a2f Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-10 06:56:06 +0000