V2 mode causes conan to raise error when an feature that is being
deprecated in conan V2 is used. This allows maintaining V2 compatibility.
Change-Id: I9c0cb70ce3a194966594d48433763e5423e187f1
Reviewed-by: Simo Fält <simo.falt@qt.io>
(cherry picked from commit dfa50ed7c3)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Due to existing conan file new versions of compilers etc. cannot
be used. Forcing Conan to generate a new one will allow using the
new versions in profile files.
Change-Id: I5adc1a42a4d620656767eb1418f341ef50232f91
Reviewed-by: Simo Fält <simo.falt@qt.io>
(cherry picked from commit b2240d78cd)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This is required for the upcoming conan integrations.
Change-Id: Id7d3390721e3521b8e6f1da8e7ab0aae5213c7af
Reviewed-by: Simo Fält <simo.falt@qt.io>
(cherry picked from commit 5cf68160c2)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
The CI uses e.g. "sccache" which is rarely used outside CI systems.
Also openssl install directories in the build profiles are specific to
CI build agents. Also headersclean option should be CI specific.
Split the current profiles in two: the CI specific profile defines only
the CI related details and includes the matching profile for the end
users.
The profile which includes other profile(s) will override the Settings
or Options if redefined.
Task-number: QTQAINFRA-4619
Change-Id: If69e8c0c283655475671fcb0ca739087cd9d2567
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
(cherry picked from commit d6fcea563f)
Reviewed-by: Toni Saario <toni.saario@qt.io>
Update qemu toolchains to include needed dependencies for QtWebEngine.
Change-Id: Ia5cf09b3f94fe75d16304e717a9da04cb120ea79
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit 54c3a77fdf)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Task-number: QTQAINFRA-4508
Change-Id: Ia93e534b6911b6aaef2a0107b067c1ba5e6a6224
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
(cherry picked from commit 478531ac2b)
Use latest platform and build tools with macOS 12
Change-Id: If3021f8f727c1775ad14b16897c7e9db3ea08ad1
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit 249603dc4f)
We want to distribute the used build profiles as well. For this we
can put the profiles in a separate Conan package that can be
installed easily.
This is a "header only" recipe which merely packs the profiles inside
the Conan package which the consumers can install with "conan install"
command:
$conan install qtbuildprofiles/6.2.0@qt/everywhere --build=always
Result:
./windows-x86_64-mingw
./linux-x86_64-gcc
./macos-ios-universal-clang
./...
Change-Id: I745a089b4e855c006e1a5f2f0995a73abbcebf2f
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit 806685f6f7)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
The coin 'Sccache' feature will take care of it.
Change-Id: Ibb9f79f2d7fc2d7fa2fcfbb24383b1f34fcf594c
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit 3c38cc22ce)
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
The provisioning doesn't support it yet.
Change-Id: Icf0cea1b58813a1e0037c00c726f4cc9096d0ac8
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
(cherry picked from commit 9358ab26ed)
Reviewed-by: Toni Saario <toni.saario@qt.io>
This will also upgrade Xcode to version 13.1
Task-number: QTQAINFRA-4508
Change-Id: Idce56d429b4cd8c7eea3b75e8d91d2f281c0c871
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit 7e2882d0a7)
Remove mutually exclusive options.
Set the 'build_type' correctly so that it reflects the used build
Options.
Change-Id: I40b139898d722583c0fc245f3f8c60657a42d26a
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit 8ef536b79e)
Some option names supported by qtbase Conan build recipe conflict with
other Conan package recipes, e.g. ICU which also supports 'shared'
option but with different supported option values.
Scope all qtbase related options in profiles to qtbase only.
Change-Id: I4c8bc2b7f5ee7cb69f3b83ef209ddda809719d73
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit 3fea4fc3c6)
Create conan profile per packaging configuration. Profiles will
carry configuration information to the builds conan does.
Profiles allow users to replicate identical configurations
to the packaging configurations and reuse existing binaries.
Change-Id: I50a2a4edbedbf56774bd4ceaae268928f8ed00e0
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit d68e108b94)
Reviewed-by: Toni Saario <toni.saario@qt.io>
This might cause issues with compiler
Task-number: QTQAINFRA-4648
Change-Id: I5971adc7fdafee4566d5c9c4efe808d72d170da6
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit 9e27a7d5e3)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Note! MinGW version is 9.0.0 but the GCC version
is 11.2 which is used with the naming of MinGW
In 6.2 branch Packaging targets needs to be as parallel
first. MinGW 8.1 can be removed ones Releasing team has
done needed script changes
Task-number: QTBUG-93479
Change-Id: I318a898c49bded60bb891b73109de829cb975750
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
(cherry picked from commit ce9ef40366)
Needed for universal build of the psql plugin.
Task-number: QTBUG-93204
Change-Id: I2c2d4d0f5f019a0eb4069d7642a901db4cc69473
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 881738a01d)
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reposity is nowdays tqtc-qmlcompilerplus, not tqtc-qmlcachegenplus
Pick-to: dev
Change-Id: I4134e74e68184c15fc65c48da57e2523093a20e3
Reviewed-by: Toni Saario <toni.saario@qt.io>
The platform doesn't support sccache, and the "feature" was
likely cargo culted from some other config, as it was a noop
at the time.
Change-Id: I792231b1bed8856e886eeca9ae37c2b824b1ea8e
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit c273c5bc65)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
... and remove ANDROID_{SDK,NDK}_HOME as they are
deprecated and might not work even.
Task-number: QTBUG-97002
Change-Id: Ie6fe93eb91fad0153aee795b73a43e84e37c8127
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit d59825d250)
Reviewed-by: Andreas Buhr <andreas.buhr@qt.io>
Let's script this so we can be sure which language settings are in use
Change-Id: Ibf9ee047ede78535d39e707fd669b8a0f407cf1e
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit 8fac7c92c9)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
The new qtpositionig repo is created to split QtLocation and
QtPositioning development.
This patch adds the new repo as a submodule to qt5.git
It also marks the qtlocation module as ignored and removes
it from dependencies, using qtpositioning instead.
Task-number: QTBUG-97188
Change-Id: I7adb9fc405119f865cd6b25a6ce9eff40d693b14
Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>
(cherry picked from commit 6af22246cf)
