The check is done in qtbase instead.
Trying to do it in the top-level project is cumbersome due to needing
to know whether it will be a static or shared Qt build.
It's also cumbersome because the top-level build used to use qtbase's
minimum cmake version values and that can get awkward to handle with
submodule dependency updates.
Replace the check with a regular minimum required call.
The minimum version is 3.16 and the upper range value for NEW policy
assignments is 3.20, while 3.21.0 is still kind of fresh and has some
AUTOUIC issues.
As a drive-by, add a clarifying comment about QtAutoDetect.cmake.
Pick-to: 6.2
Task-number: QTBUG-95018
Change-Id: Ifb4ec0b4ed7f56ab0179feb79072c93d1d66ce63
Reviewed-by: Craig Scott <craig.scott@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
To avoid error 'too many path components' when building Qt on Windows.
Pick-to: 6.2
Task-number: QTBUG-95286
Change-Id: I122cfddc8c19201f4c04fde94d051c5e1278c040
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Simo Fält <simo.falt@qt.io>
While there was no target os value, COIN thinks that it is a normal
desktop target. This causes the host and target artifacts being copied
to wrong location.
Change-Id: Ie478f66e424859fbbf51d3f2d9d7efba032b30c5
Reviewed-by: Kimmo Ollila <kimmo.ollila@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Script was pointing to incorrect version and the prebuilt version
was missing from cache. OpenSSL Android is now rebuilt and cached.
Task-number: QTQAINFRA-4501
Change-Id: I31db800fa6814c3e7c1e649e2bbe3e3c80b9f4ce
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit 675c9ad6c6)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
ICC hasn't been used in a while, so no point in installing it.
Change-Id: Iefbdee631d57c66e2156625daf333337f9163365
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
Following qtandroidextras removal in the commit
912fdda4a4, coin's platform
config yaml file has to be removed.
Pick-to: 6.2
Task-number: QTBUG-84382
Change-Id: I8c3bc89938315ae8361d8d89ec6543d3699440ed
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
Qt purchasing was not part of Qt 6, and will be moved as a demo/example
under qtdoc, thus we don't need it here.
Task-number: QTBUG-84776
Pick-to: 6.2
Change-Id: Ie6f704e72914072e7e105763ffaeae1d13cff086
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Reviewed-by: Rami Potinkara <rami.potinkara@qt.io>
Remove qtandroidextras from the submodules list of qt5 since it's
not part of Qt 6.
Task-number: QTBUG-84382
Change-Id: I2f9b5a576781b5d45e563dfda7830c17996685a5
Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>
Multimedia needs shadertools for building, so make that explicit.
Some examples use Qt Quick Controls, so we recommend that as well
Pick-to: 6.2
Change-Id: If067defe371dc9584634d1c1aa7c5eae74c9af25
Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>
Based on wasm maintainer these should work already
Pick-to: 6.2
Change-Id: Ifa9606546e6d04be824d5507306a8c6fb5f2d035
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
It has to be addon
Change-Id: Ideafe810c032be9fdff6fae8cefb438204f61be8
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit a1ee8408ff)
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
Custom packages for Qt6.2. macOS:use custom build Qt5.15 package
with separate Squish server adjusted for Qt6.2
Pick-to: 6.2
Change-Id: I25ed60f8ec9e3fdf919e5003f52a58cdca14e633
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
Timeout increased so this should be ok to move back to Redhat 8.2
Task-number: QTQAINFRA-4415
Change-Id: Iece9aefcbfdade2e29f495039de1f1fcafec2caf
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit e216d829ff)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Copy the global and config folder from under qtbase to directory from
which the documentation.tar.gz is created. This is similar to how these
are added in qmake builds.
Pick-to: 6.1 6.2
Task-number: QTBUG-94443
Change-Id: I1dfd6dd05057bb1bfdaeec9cf5d03fbfe474a5d1
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
The config is marked as Packaging, but it didn't specify the list of
CMake configurations to build and defaulted only to Debug.
Pick-to: 6.2
Task-number: QTQAINFRA-4492
Change-Id: If75eaf76d386442355c45e4705fe2f4c0eeaa086
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
This will allow exporting the testlogs for release.
Pick-to: 6.1
Pick-to: 6.2
Task-number: QTBUG-94111
Change-Id: Ib0db2b8ba0814539f235ddff412653e797b3f3e2
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
Quick3D's runtime asset animation needs QuickTimeline module.
This is an optional module just for the animation feature.
Pick-to: 6.2
Change-Id: I080b23e2f8f73277a92ef6207829fd3e3fc6d1b5
Reviewed-by: Christian Strømme <christian.stromme@qt.io>
It's no longer part of Qt (as of Qt 6)
Task-number: QTBUG-89564
Change-Id: I302c58f1b6a55797cf1f6722eafe936561bf456f
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
According to plan Qt Webview will be back in Qt 6.2 so let's add
it in official builds
Task-number: QTBUG-93222
Change-Id: I20a20e74f08327a15d6c3985a42efc01b01a5848
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
At this point let's add only target for QtBase. Target for
QtDeclarative, QtQuick3d and QtQuickcontrols2 will be
added later when we have all required fixes.
Task-number: QTQAINFRA-3555
Task-number: QTQAINFRA-4285
Change-Id: I59ef76079e98ba428cdb7abcb2560f434c37f517
Reviewed-by: Kimmo Ollila <kimmo.ollila@qt.io>
Reviewed-by: Toni Saario <toni.saario@qt.io>
Rhel 8.2 with Android emulator seems to be unstable
Change-Id: Ibd858b25959b397d68e3242df0bf49eda3ca9445
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Windows and macOS hosts were still using 28 while Linux uses 29.
Change-Id: I36afd17277605b6478bf840340c0341a7f327caa
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
If submodule url is absolute, don't use mirror, don't set
remote.gerrit.url and remote.gerrit.fetch.
To avoid error when passing "--mirror git://github.com/qt/":
fatal: remote error: qt/https://code.qt.io/playground/qlitehtml
is not a valid repository name
Visit https://support.github.com/ for help
amends 7374ef8e38
Change-Id: Ifb4e1c8de57c7729f2965c16388f1acd763a150f
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
We are not using them for the Qt Creator build, since for us it makes
more sense to define these things in the Qt Creator branches. They
create additional noise (and confusion) in the COIN interface though, so
remove them.
Pick-to: 6.1
Change-Id: Iadcb9570f88fa0245996d8e7c112dc8b54dfe80d
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Matti Paaso <matti.paaso@qt.io>
