Commit Graph

4741 Commits

Author SHA1 Message Date
Joerg Bornemann
149cc2ebc0 Remove qtquickcontrols from .gitmodules
This repository is not available in Qt6.

Every repository that recommends qtquickcontrols should recommend
qtquickcontrols2 instead.  However, this has been merged into
qtdeclarative, which means that the existent dependencies on
qtdeclarative are sufficient.

Pick-to: 6.2
Change-Id: I30980bbbe9ca495f12dc591a693ebc3a4a6a01bc
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
2021-08-10 12:37:46 +02:00
Qt Submodule Update Bot
b2ff16b6d1 Update submodules on 'dev' in qt/qt5
Change-Id: I0d0dac5315eca1ca25972c79fdb33f983ff38601
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-08-07 13:07:03 +03:00
Alexandru Croitor
9218d50a6e CMake: Update provisioned CMake to version 3.21.1
Task-number: QTBUG-95018
Task-number: QTBUG-95229
Pick-to: 6.2
Change-Id: Ibed6ff323ca1633444ed29423ce1e94c99e68f77
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
2021-08-06 20:30:36 +02:00
Qt Submodule Update Bot
5afbb0606f Update submodules on 'dev' in qt/qt5
Change-Id: If133f81919b0bdef749ace2f3f7c09432ee281f6
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-08-06 21:30:34 +03:00
Mitch Curtis
204d92c244 Recommend qtimageformats for qtdeclarative
qtquickcontrols2 uses it.

Task-number: QTBUG-95173
Change-Id: I6a721f34545656069e91bde9c69b0af976b07e60
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2021-08-04 09:41:47 +02:00
Mitch Curtis
ed7a7e75ff Remove qtquickcontrols2 submodule
It's now a part of qtdeclarative.

Fixes: QTBUG-95416
Change-Id: I2e308914aa0c97608534187737b6d5ea596f100c
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2021-08-02 10:06:04 +02:00
Daniel Smith
f4c302caf2 Update submodules on 'dev' in qt/qt5
Change-Id: Ibb96bcc1ea5f9a86572a2dee139a7abf87f43d32
Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>
2021-08-02 08:06:03 +00:00
Kimmo Ollila
16ab287262 Add Integrity target for other modules
QtQuick3D, QtRemoteObjects, also enable Harfbuzz and Assimp

Change-Id: I26e0f60afad40e66f858f99e8e7c852ac5fd9fbb
Reviewed-by: Simo Fält <simo.falt@qt.io>
2021-07-29 08:19:41 +03:00
Qt Submodule Update Bot
105cddfef2 Update submodules on 'dev' in qt/qt5
Change-Id: I2bfd68ab5427989907bb93327d7c8caf908383e2
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-07-28 21:35:22 +03:00
Kimmo Ollila
dd24bc25c9 Add Integrity target for other modules
QtDeclarative, QtImageFormats, QtShaderTools and QtQuickControls2

Change-Id: I24906d833d364a80025663928650f032a8618c22
Reviewed-by: Simo Fält <simo.falt@qt.io>
2021-07-28 07:54:00 +03:00
Simo Fält
9385d5d687 COIN: Fix integrity target configure arguments
Change-Id: I624feea29eb70dadb9e959d6056eaccd73b7169a
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2021-07-28 07:53:26 +03:00
Qt Submodule Update Bot
18bc04e23b Update submodules on 'dev' in qt/qt5
Change-Id: I5215288447c59bd719c8f5d6349a75eb95892697
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-07-28 00:42:50 +03:00
Alexandru Croitor
4180e9c511 CMake: Remove CMake minimum version check in top-level project
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>
2021-07-27 10:21:11 +02:00
Kimmo Ollila
401ef8a8b3 Add Integrity target for QtSvg
Change-Id: Ic677c932151aeed9f72e49baba9038bf122e5b5b
Reviewed-by: Simo Fält <simo.falt@qt.io>
2021-07-27 09:50:52 +03:00
Qt Submodule Update Bot
4f1f1b462a Update submodules on 'dev' in qt/qt5
Change-Id: I6236a6717304b6911f8c1176b3ce07d01e1dadce
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-07-27 06:34:15 +03:00
Qt Submodule Update Bot
8959aad7e2 Update submodules on 'dev' in qt/qt5
Change-Id: Id8d5c92740fcf0c86540981f93666eecddd6caf1
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-07-24 11:03:51 +03:00
Qt Submodule Update Bot
bc18b03ba7 Update submodules on 'dev' in qt/qt5
Change-Id: I8123dfbf570dace59fcaab9ae0c01816817095f6
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-07-24 01:13:06 +03:00
Alexandru Croitor
e8b0be7711 Provisioning: Install ninja 1.10.2 for Windows and macOS
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>
2021-07-23 10:18:23 +02:00
Simo Fält
b5c4effe7e Make Integrity platform config as a cross compile target
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>
2021-07-22 10:26:16 +03:00
Qt Submodule Update Bot
26cd21470b Update submodules on 'dev' in qt/qt5
Change-Id: Ia3ee883725d1ae8845eafbefd23d9a04ca46c545
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-07-15 03:23:31 +03:00
Ulf Hermann
fab470c190 Coin: Add tqtc-qmlcachegenplus configuration file
Pick-to: 6.2
Change-Id: Ie66b837e95339ff6837ebfa83797716233bb8145
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2021-07-14 10:51:52 +02:00
Qt Submodule Update Bot
25ae371e10 Update submodules on 'dev' in qt/qt5
Change-Id: I4a7ce2735480be34f4c3964c90223cbf58b034f4
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-07-14 09:48:05 +03:00
Qt Submodule Update Bot
f1feffcd2b Update submodules on 'dev' in qt/qt5
Change-Id: Ib3de73d6203b4442b6fe46224753382d92127bb0
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-07-13 21:27:33 +03:00
Alexandru Croitor
d7c2951de0 CMake: Update provisioned CMake to version 3.20.5
Pick-to: 6.2
Change-Id: Id09eedf75b02b28dd94b0e3f858a05ebe8875679
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2021-07-09 16:58:13 +02:00
Heikki Halmet
8fa865b37b Update Yocto toolchains
Task-number: QTQAINFRA-4459
Change-Id: I0a6144db1ca1ceb35791749bf5b056ced2307ab9
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit 34d0ca0f39)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-07-08 09:01:53 +00:00
Allan Sandfeld Jensen
3f551fedd6 Add qtwebengine dependencies to provisioning
Pick-to: 6.2
Change-Id: If2cc949ce0669281d65995175480ac7cbd9fad74
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
2021-07-06 09:32:23 +02:00
Heikki Halmet
c9bc1ffc10 Add correct version for prebuilt OpenSSL Android
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>
2021-07-01 15:19:48 +00:00
Tony Sarajärvi
e0eb04ecf8 Add execution attribute to provisioning scripts
Change-Id: Ia241a4211d24d2788f0f0ef9af55b23a6b227624
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2021-07-01 15:40:33 +03:00
Tony Sarajärvi
158cc96835 Remove ICC from provisioning
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>
2021-07-01 15:40:33 +03:00
Qt Submodule Update Bot
2144c1914e Update submodules on 'dev' in qt/qt5
Change-Id: Iedef78a8d717b01d4f5b8e56802f6f2221d6b38a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-07-01 12:14:02 +03:00
Assam Boudjelthia
f1fcb89f26 Remove qtandroidextras.yaml from platform_configs
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>
2021-06-29 11:55:04 +03:00
Assam Boudjelthia
eb16fe519f Remove qtpurchasing submodule from qt5
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>
2021-06-28 13:29:13 +00:00
Heikki Halmet
ebf78374a7 Remove Insignificant flag from Windows ARM target
Task-number: QTQAINFRA-4452
Change-Id: I049dfb8df259fed40438ee08b339507bda3ed768
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit 0a5e63dce9)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-06-28 09:21:05 +00:00
Assam Boudjelthia
912fdda4a4 Remove qtandroidextras submodule
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>
2021-06-28 08:11:43 +00:00
Qt Submodule Update Bot
53ff4f00bd Update submodules on 'dev' in qt/qt5
Change-Id: Id120afaa6658c2cadbf17dba87707d47379854bf
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-06-26 19:31:25 +03:00
Qt Submodule Update Bot
0e5b5af8b3 Update submodules on 'dev' in qt/qt5
Change-Id: I527d41ac13bf60b705d2c245b14602adbc16a0c1
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-06-26 07:32:48 +03:00
Lars Knoll
4131439fb9 Make QtMultimedia depend on shadertools and recommend qtquickcontrols2
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>
2021-06-25 13:16:21 +00:00
Jani Heikkinen
bae9580da1 Add missing wasm target build for windows and macOS hosts
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>
2021-06-25 17:18:26 +10:00
Qt Submodule Update Bot
f1b826440d Update submodules on 'dev' in qt/qt5
Change-Id: I75c5072b7fe2c73b3f75a9f8b85220039dd879fb
Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>
2021-06-24 09:10:22 +00:00
Jani Heikkinen
a341894f29 Fix qtmultimedia status
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>
2021-06-24 11:10:20 +02:00
Tanja Remes
1c17b656e0 Provisioning: update Squish packages
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>
2021-06-22 06:04:53 +00:00
Heikki Halmet
9a029a5872 Switch back to RedHat 8.2 for Android target
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>
2021-06-21 04:58:57 +00:00
Toni Saario
7ed6d04410 Archive global and config from qtbase in doc build
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>
2021-06-16 21:27:56 +00:00
Alexandru Croitor
52eebe8a89 WoA: Build both release and debug configs for Windows on ARM
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>
2021-06-16 15:00:29 +02:00
Robert Griebl
2b22f80725 Add a platform config file for Qt Application Manager
Change-Id: I59013a841e96eb679798e906af4c1af09884dc45
Reviewed-by: Dominik Holland <dominik.holland@qt.io>
2021-06-15 19:55:29 +02:00
Tor Arne Vestbø
27f62f7dd8 coin: Make macOS on ARM developer-build tests significant
Change-Id: I2cc95e955fb313131dbef56028332b611d5dba7d
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit b90fef29dc)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-06-15 05:56:39 +00:00
Simo Fält
9673311626 Add 'Packaging' feature for Mac TestOnly CI configs
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>
2021-06-09 13:01:32 +00:00
Inho Lee
6069cf9a84 Quick3D : Add optional dependency to QtQuickTimeline
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>
2021-06-09 09:32:47 +00:00
Dominik Holland
92f423c06d Provisioning: Install libdlt-dev
Fixes: COIN-217
Change-Id: I3ce5da4d6b8e79a766ad90715462a9c8b7c50294
Reviewed-by: Toni Saario <toni.saario@qt.io>
2021-06-08 11:18:57 +02:00
Dominik Holland
30e02f32fb Add a platform config file for Qt DLT Logging
Change-Id: I6ad13ba724158719c463d1e64e9aa21e59cd89c9
Reviewed-by: Robert Griebl <robert.griebl@qt.io>
2021-06-07 22:47:24 +02:00