Commit Graph

4753 Commits

Author SHA1 Message Date
Qt Submodule Update Bot
bed102a587 Update submodules on '6.2' in qt/qt5
Change-Id: I85d2b2185329ec189baac4a7b5c93bdb63484c43
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-08-19 09:33:14 +03:00
Allan Sandfeld Jensen
1f452fd479 Update node.js to 12
For Ubuntu it means using an alternative packages, for
openSUSE not using an alternative package.

Change-Id: I09085428db083adc1ff1d68f384cd19c83605bfd
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit c4b8c908b6)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-08-18 19:19:46 +00:00
Eike Ziller
aaf0fad6b5 Provisioning: Install 32bit version of Ninja on Windows
So it also runs on 32bit Windows. Ninja upstream switched their
binary builds to 64bit with Ninja 1.7, so we need to provide our own.

Amends e8b0be7711

Change-Id: Id3329ca481b7743b4d40dad8faaa62285dbe53b0
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit f945fdc735)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-08-17 15:59:58 +00:00
Qt Submodule Update Bot
04ad2b6523 Update submodules on '6.2' in qt/qt5
Change-Id: I89c18397efc86bdf62a11c439a99627b03033b32
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-08-17 17:34:49 +03:00
Qt Submodule Update Bot
2ef340e02d Update submodules on '6.2' in qt/qt5
Change-Id: Iae77e867f60ba639acde4187708786611d5b5a4c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-08-17 07:59:27 +03:00
Joerg Bornemann
384bff22f7 Remove qtgraphicaleffects from .gitmodules
This repository has been merged into qt5compat.

Change the 'recommends' field of qtquickcontrols2 from
qtgraphicaleffects to qt5compat.

Fixes: QTBUG-95228
Change-Id: I07ad4302c874e25673b7644cc9b7f2b24cca3833
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
(cherry picked from commit cec25d2ac6)
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2021-08-16 12:47:23 +02:00
Mitch Curtis
76741ceaa5 Remove qtquickcontrols2.yaml from platform_configs
Task-number: QTBUG-95173
Change-Id: If7470b3d5cd5721def97fd5b41e46e037cec2286
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 9b3411da8d)
Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>
v6.2.0-beta3
2021-08-14 11:59:02 +02:00
Alexandru Croitor
92b188ef62 CMake: Update provisioned CMake to version 3.21.1
Task-number: QTBUG-95018
Task-number: QTBUG-95229
Change-Id: Ibed6ff323ca1633444ed29423ce1e94c99e68f77
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
(cherry picked from commit 9218d50a6e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-08-14 09:58:51 +00:00
Tor Arne Vestbø
3344530eaa Improve OpenSSL provisioning on macOS
- Make the script idempotent
  - Use local architecture instead of hard-coding x86_64
  - Set deployment target to 10.14
  - Improve logging by not building with --silent
  - Don't install manual pages
  - Allow custom install prefix (for testing)

Change-Id: I728a2595987db0568568bbb8ca8117effca73997
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit f8fab3be9b)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-08-13 16:55:47 +00:00
Daniel Smith
aebf8f743a Update submodules on '6.2' in qt/qt5
Change-Id: I9f2c3a616edae0ed4f033e76a85a00ea7ab7c40f
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>
2021-08-13 08:26:00 +00:00
Mitch Curtis
98fddae379 Recommend qtimageformats for qtdeclarative
qtquickcontrols2 uses it.

Task-number: QTBUG-95173
Change-Id: I6a721f34545656069e91bde9c69b0af976b07e60
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
(cherry picked from commit 204d92c244)
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2021-08-13 10:25:59 +02:00
Mitch Curtis
a3f580b0ab Remove qtquickcontrols2 submodule
It's now a part of qtdeclarative.

Fixes: QTBUG-95416
Change-Id: I2e308914aa0c97608534187737b6d5ea596f100c
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit ed7a7e75ff)
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2021-08-13 10:25:58 +02:00
Heikki Halmet
939c7e7f57 Change locale to en_US and install all available language packages
These are needed for Android tests

Task-number: COIN-727
Change-Id: Id12a75da2b4485ba5d655ceb0b7c7d6426f2b4cd
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit beb8fcca5f)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-08-12 18:47:27 +00:00
Alexandru Croitor
bdfbd4ff3f Remove qtgraphicaleffects.yaml from platform_configs
Task-number: QTBUG-95757
Change-Id: Ia83795bbc2ddef9532fd196d64776571e50c1d6c
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
(cherry picked from commit 1256b4d504)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-08-12 15:44:50 +00:00
Joerg Bornemann
8e07b4271b Remove qtquickcontrols from .gitmodules
This repository is not available in Qt6.

Every repository that recommended qtquickcontrols already recommends
qtquickcontrols2.

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>
(cherry picked from commit 149cc2ebc0)
2021-08-10 16:46:31 +02:00
Qt Submodule Update Bot
a0721ffc10 Update submodules on '6.2' in qt/qt5
Change-Id: I0c36c5156827e4751ba4a9ff12c6a16894a8e5f5
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-08-03 13:21:32 +03:00
Qt Submodule Update Bot
fa08d846df Update submodules on '6.2' in qt/qt5
Change-Id: I54aedf453b786db519e77da9a314545f08a37266
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-07-29 10:13:35 +03:00
Qt Submodule Update Bot
d1e747e9c2 Update submodules on '6.2' in qt/qt5
Change-Id: I3bbb725876e9f8f5acd9f651a771f28cc55f063b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-07-28 07:07:03 +03:00
Simo Fält
ad7211e014 Manually update qtwebengine to unlock CI for pyside-setup
Change-Id: I95862a0e46f44de94dc3926e805a2bf7df3a6e9a
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2021-07-27 13:53:41 +03:00
Alexandru Croitor
abed2215b2 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.

Task-number: QTBUG-95018
Change-Id: Ifb4ec0b4ed7f56ab0179feb79072c93d1d66ce63
Reviewed-by: Craig Scott <craig.scott@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 4180e9c511)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-07-27 09:31:19 +00:00
Qt Submodule Update Bot
97baab98fa Update submodules on '6.2' in qt/qt5
Change-Id: I12fe7bb75d07e89d4c25ac5d366bb011ec76e872
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
v6.2.0-beta2
2021-07-25 05:26:56 +03:00
Qt Submodule Update Bot
3875da7f7a Update submodules on '6.2' in qt/qt5
Change-Id: I3b34c0b29ce2daba3433e5daa9ef3379a4087fa7
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-07-24 18:27:13 +03:00
Alexandru Croitor
200542194a Provisioning: Install ninja 1.10.2 for Windows and macOS
To avoid error 'too many path components' when building Qt on Windows.

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>
(cherry picked from commit e8b0be7711)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-07-23 16:41:21 +00:00
Qt Submodule Update Bot
3c8e55904b Update submodules on '6.2' in qt/qt5
Change-Id: I66530634e78280ed50b2036428df0f29176788c2
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-07-23 04:35:17 +03:00
Qt Submodule Update Bot
7c6987f5f2 Update submodules on '6.2' in qt/qt5
Change-Id: I1fbf348a2ce336d230c67cc8ed03fae05d725f29
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-07-22 10:57:22 +03:00
Qt Submodule Update Bot
07ba2084de Update submodules on '6.2' in qt/qt5
Change-Id: I91aab3d9a572326775c0a2c37383d77918984893
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-07-21 23:25:48 +03:00
Qt Submodule Update Bot
6742cfecb7 Update submodules on '6.2' in qt/qt5
Change-Id: Ic85a2785a837d73507e866a2f3a3b1b29f21ea54
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-07-21 04:05:10 +03:00
Qt Submodule Update Bot
8711116396 Update submodules on '6.2' in qt/qt5
Change-Id: Idc0e457695645fc8fed9a93ca83ee5437f25a1d0
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-07-20 12:55:19 +03:00
Qt Submodule Update Bot
b3efc246b3 Update submodules on '6.2' in qt/qt5
Change-Id: I5e0d932100ae441de15fa7346311b9165c4ed4c6
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-07-20 02:41:20 +03:00
Ulf Hermann
d50ea75346 Coin: Add tqtc-qmlcachegenplus configuration file
Change-Id: Ie66b837e95339ff6837ebfa83797716233bb8145
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit fab470c190)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-07-14 11:09:04 +00:00
Qt Submodule Update Bot
90d85dae7d Update submodules on '6.2' in qt/qt5
Change-Id: I7e358268f00769e5acd31546a31df315bab4908d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-07-13 16:47:34 +03:00
Alexandru Croitor
d0583b0388 CMake: Update provisioned CMake to version 3.20.5
Change-Id: Id09eedf75b02b28dd94b0e3f858a05ebe8875679
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
(cherry picked from commit d7c2951de0)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-07-09 18:50:43 +00:00
Allan Sandfeld Jensen
c0c484278d Add qtwebengine dependencies to provisioning
Change-Id: If2cc949ce0669281d65995175480ac7cbd9fad74
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
(cherry picked from commit 3f551fedd6)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-07-06 10:28:27 +00:00
Assam Boudjelthia
e3e388d76c 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
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>
(cherry picked from commit eb16fe519f)
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
v6.2.0-beta1
2021-07-01 17:26:24 +00:00
Heikki Halmet
675c9ad6c6 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.

Pick-to: dev
Pick-to: 6.1
Pick-to: 6.0
Pick-to: 5.15
Pick-to: 5.12
Task-number: QTQAINFRA-4501
Change-Id: I31db800fa6814c3e7c1e649e2bbe3e3c80b9f4ce
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2021-07-01 12:34:51 +03:00
Qt Submodule Update Bot
fad3ce0574 Update submodules on '6.2' in qt/qt5
Change-Id: I47b98b1e84927a50f99dbda1832d14d2a70a7345
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-06-30 16:47:05 +03:00
Qt Submodule Update Bot
6dd1b85fd6 Update submodules on '6.2' in qt/qt5
Change-Id: I83f3659feace8cd95ef1208886602b4a0734059c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-06-30 02:39:13 +03:00
Assam Boudjelthia
9d47c22900 Remove qtandroidextras.yaml from platform_configs
Following qtandroidextras removal in the commit
912fdda4a4, coin's  platform
config yaml file has to be removed.

Task-number: QTBUG-84382
Change-Id: I8c3bc89938315ae8361d8d89ec6543d3699440ed
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
(cherry picked from commit f1fcb89f26)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-06-29 09:53:39 +00:00
Qt Submodule Update Bot
8cecbd9e8b Update submodules on '6.2' in qt/qt5
Change-Id: I2a38867ad47eb01b5f1a1e65988469ac13aa3089
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-06-29 10:48:37 +03:00
Samuli Piippo
bb95d19ca8 Build QDB without icu or system doubleconversion
... to avoid unnecessary dependencies.

Pick-to: dev
Change-Id: I607f034d5b092e69e7d2aead4c0747268b690a5d
Reviewed-by: Toni Saario <toni.saario@qt.io>
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2021-06-28 14:59:36 +03:00
Qt Submodule Update Bot
6ada10bf35 Update submodules on '6.2' in qt/qt5
Change-Id: Ic310607b215a1ca819f2145ffd965f282f05507b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-06-26 18:44:15 +03:00
Lars Knoll
9a2aba6192 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

Change-Id: If067defe371dc9584634d1c1aa7c5eae74c9af25
Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>
(cherry picked from commit 4131439fb9)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-06-25 22:17:30 +00:00
Jani Heikkinen
ea62a47c56 Add missing wasm target build for windows and macOS hosts
Based on wasm maintainer these should work already

Change-Id: Ifa9606546e6d04be824d5507306a8c6fb5f2d035
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit bae9580da1)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-06-25 13:16:27 +00:00
Qt Submodule Update Bot
ca5bc70a3b Update submodules on '6.2' in qt/qt5
Change-Id: I82c549410e7c80d76975e9faaf5966d29cd75e28
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-06-23 16:09:16 +03:00
Tanja Remes
e2877a3e5b Provisioning: update Squish packages
Custom packages for Qt6.2. macOS:use custom build Qt5.15 package
with separate Squish server adjusted for Qt6.2

Change-Id: I25ed60f8ec9e3fdf919e5003f52a58cdca14e633
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit 1c17b656e0)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-06-22 14:14:08 +00:00
Qt Submodule Update Bot
eea5f47027 Update submodules on '6.2' in qt/qt5
Change-Id: I05b348aa027e333e47301ad9186368c8cb9a16ab
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
v6.2.0-alpha1
2021-06-22 08:24:28 +03:00
Heikki Halmet
34d0ca0f39 Update Yocto toolchains
Pick-to: dev
Task-number: QTQAINFRA-4459
Change-Id: I0a6144db1ca1ceb35791749bf5b056ced2307ab9
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2021-06-18 12:43:41 +03:00
Heikki Halmet
e216d829ff Switch back to RedHat 8.2 for Android target
Timeout increased so this should be ok to move back to Redhat 8.2

Pick-to: dev
Task-number: QTQAINFRA-4415
Change-Id: Iece9aefcbfdade2e29f495039de1f1fcafec2caf
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2021-06-18 12:42:44 +03:00
Toni Saario
91030b897c 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.

Task-number: QTBUG-94443
Change-Id: I1dfd6dd05057bb1bfdaeec9cf5d03fbfe474a5d1
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit 7ed6d04410)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-06-16 22:22:31 +00:00
Alexandru Croitor
6276e48226 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.

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>
(cherry picked from commit 52eebe8a89)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-06-16 14:43:33 +00:00