Iikka Eklund 83752fcd2b Conan: Rename 'extra_cmake_args' Conan option as 'cmake_args_qtbase' ... It turns out that we need to support two ways to pass cmake args as Conan options. Those that are meant for qtbase only, like "-DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}", and those that are meant for leaf modules only. Rename the current 'extra_cmake_args' Conan recipe option as 'cmake_args_qtbase' to make it clear these cmake args are passed to qtbase build only. The leaf modules will be using 'cmake_args_leaf_module' as the Conan option name. Pick-to: 6.2 Change-Id: I456b8b07da5684f386cac668a5cd3e2509c733ac Reviewed-by: Toni Saario <toni.saario@qt.io>		2021-08-30 05:51:36 +00:00
.github/workflows	Github Actions: many minor updates	2021-01-22 18:48:54 +01:00
bin	Add missing -help argument to qt-configure-module	2021-08-20 19:44:43 +02:00
cmake	Update Android default SDK from 29 to 30	2021-08-27 18:31:17 +00:00
coin	CMake: Build a subset of tests when targeting iOS in the CI	2021-08-26 16:40:15 +02:00
config.tests	Fix the precompile_header configure test	2021-06-19 01:08:23 +02:00
dist	Add Qt 6.0.0 changes file	2020-11-16 10:02:08 +02:00
doc	Doc: Add global \versionlessCMakeCommandsNote qdoc macro	2021-08-23 13:06:27 +02:00
examples	CMake: Create plugin initializers for static user plugins	2021-08-24 16:10:31 +02:00
lib	Purge all fonts	2015-08-18 19:59:14 +00:00
libexec	Fix global header exclusion regex	2021-07-09 13:56:18 +02:00
mkspecs	Update Android default SDK from 29 to 30	2021-08-27 18:31:17 +00:00
qmake	Update Android default SDK from 29 to 30	2021-08-27 18:31:17 +00:00
src	Android: pass -g to testrunner to grant run time permissions	2021-08-29 19:39:42 +03:00
tests	Include what you use ! filesystem.h uses QOperatingSystemVersion	2021-08-27 20:31:18 +02:00
util	unicode: Generate tables for IDNA/UTS #46	2021-08-26 16:55:05 +02:00
.cmake.conf	CMake: Bump min required CMake version for static Qt builds to 3.21	2021-08-10 16:51:53 +02:00
.gitattributes	Give batch files CRLF line endings	2020-11-04 15:02:29 +00:00
.gitignore	testlib: Accurately name JUnit test, and only run for JUnitXML reporter	2021-07-29 15:39:40 +02:00
.lgtm.yml	Skip LGTM analysis for the bootstrap library and tools	2020-07-16 01:04:34 +02:00
.qmake.conf	Bump version	2021-02-18 07:20:21 +02:00
.tag	Update the git-archive export options	2012-09-07 15:39:31 +02:00
CMakeLists.txt	CMake: Enforce minimum CMake version in user projects	2021-08-04 16:03:08 +02:00
conanfile.py	Conan: Rename 'extra_cmake_args' Conan option as 'cmake_args_qtbase'	2021-08-30 05:51:36 +00:00
config_help.txt	Remove dysfunctional -coverage configure argument	2021-08-10 12:00:13 +02:00
configure	Remove unsupported, host-related options from configure shell script	2021-08-05 02:44:27 +02:00
configure.bat	Fix our usage of CMake script mode in Windows configure	2021-08-20 19:44:43 +02:00
configure.cmake	Fix Android -ltcg build	2021-08-20 09:48:27 +02:00
dependencies.yaml	Re-add dependencies.yaml now that qt5.git wip/qt6 builds fine	2019-09-18 13:19:31 +02:00
LICENSE.FDL	Initial import from the monolithic Qt.	2011-04-27 12:05:43 +02:00
LICENSE.GPL2	Add new license header templates and license files	2016-01-14 20:43:46 +00:00
LICENSE.GPL3	Add new license header templates and license files	2016-01-14 20:43:46 +00:00
LICENSE.GPL3-EXCEPT	Add new license header templates and license files	2016-01-14 20:43:46 +00:00
LICENSE.LGPL3	Add new license header templates and license files	2016-01-14 20:43:46 +00:00
LICENSE.LGPLv3	Remove LICENSE.GPLv3, LICENSE.LGPLv21, LGPL_EXCEPTION.txt	2018-04-16 11:02:14 +00:00
LICENSE.QT-LICENSE-AGREEMENT	Update enterprise license agreement v4.2.1	2019-12-18 13:07:19 +02:00
qt_cmdline.cmake	Remove dysfunctional -coverage configure argument	2021-08-10 12:00:13 +02:00
sync.profile	Implement generating of a module cpp export header	2021-06-24 20:40:49 +02:00