Commit Graph

4633 Commits

Author SHA1 Message Date
Qt Submodule Update Bot
1da070930a Update submodules on 'dev' in qt/qt5
Change-Id: I99095f78c24e7e33390357962b60674139186403
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-04-27 05:06:11 +03:00
Qt Submodule Update Bot
e8dbbafd1d Update submodules on 'dev' in qt/qt5
Change-Id: I69ea8bbff2881cdcb0cb4776c8dfec950773c46d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-04-26 23:08:57 +03:00
Qt Submodule Update Bot
2b371b2920 Update submodules on 'dev' in qt/qt5
Change-Id: I6cd6e5bed9d386758d69877a090b272b1e27f007
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-04-26 15:56:01 +03:00
Heikki Halmet
0e9f489192 Provisioning: Upgrade OpenSSL version to 1.1.1k
Pick-to: 6.1
Pick-to: 6.0
Pick-to: 5.15
Pick-to: 5.12
Change-Id: I539d6da1953a40190fbfc8ff80f8e8332d797b1f
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2021-04-26 12:56:01 +00:00
Heikki Halmet
2d47450e69 Provisioning: Fix gcc toolset source path
Pick-to: 6.1
Pick-to: 6.0
Change-Id: I4e81894648c25ce629914bc4bd9ffa65681ad004
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2021-04-26 13:10:14 +03:00
Qt Submodule Update Bot
d142a10dd5 Update submodules on 'dev' in qt/qt5
Change-Id: I2765de991ac8c2fed865506d44a3ca9eea2188b7
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-04-24 12:03:39 +03:00
Qt Submodule Update Bot
c9cc27815c Update submodules on 'dev' in qt/qt5
Change-Id: I02823722e7c8c24a682e8c8a63520ff0f69a64a2
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-04-24 05:44:38 +03:00
Qt Submodule Update Bot
dcdc29133d Update submodules on 'dev' in qt/qt5
Change-Id: Ib358c3ed83afff5162f39f76a689e348bbb6d821
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-04-23 19:29:48 +03:00
Heikki Halmet
1ebec86732 Remove packaging flag from CentOS targets
This will also remove CentOS target under QtCreator
and RHEL's Insignificant flags from submodules

Task-number: QTQAINFRA-4416
Change-Id: I2e6d910dfbba7a7903b149f5cf0bc3386cd4e3e2
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2021-04-23 14:32:45 +03:00
Toni Saario
0d3d17d388 Add target arch for universal macOS target
This makes the field to reflect reality as otherwise it will be
resolved from the template and excludes the arm64.

Change-Id: I39972e47ba2a0ab9fe4322c844b60383187a762b
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2021-04-23 06:02:47 +00:00
Jani Heikkinen
5f38d6aa61 Update additional library sha1's to qt5.git
Change-Id: I92078b3664cee04c3ad9e96d02072933a21b904c
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
2021-04-22 11:39:14 +03:00
Jani Heikkinen
e574441847 Drop unnecessary qttools dependency from m2m protocols
Change-Id: I5b8a169e4c96e76bc34806a8befdc83784106413
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
2021-04-22 11:39:14 +03:00
Jani Heikkinen
a8a17646ab Change all (except qtconnectivity) additional libraries to addons
It has been decided to *not* ship source-only Conan packages in Qt 6.1,
but revert back to delivering the additional libraries similarly as with
Qt 5.

That's why we need to switch all additional libraries to addon to start
building binaries for those as well in qt5.git integration.

qtconnectivity will be changed when QTBUG-92990 is fixed.

Task-number: QTBUG-91796
Change-Id: Ia154b62d5c1a997575d844aaf21f399a24626748
Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
(cherry picked from commit 55874781a1)
2021-04-22 11:39:14 +03:00
Heikki Halmet
4e09a6db79 Provisioning: Remove mac certificates and signing tools
Those will be provided by Coin

Pick-to: 6.1
Pick-to: 6.0
Change-Id: Id38b99b11d8b7988d743fc8a302760c3286087ff
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
Reviewed-by: Toni Saario <toni.saario@qt.io>
2021-04-22 08:44:07 +03:00
Qt Submodule Update Bot
3062f5127d Update submodules on 'dev' in qt/qt5
Change-Id: I496885d1367ef141b14f45577fe01fb0a34c8eb6
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-04-22 00:59:08 +03:00
Juha Vuolle
76e9d4bfbb Mark QtSensors as an addon
The QtSensors is headed to Qt 6.2 and initial cmake port has been merged

Task-number: QTBUG-92502
Change-Id: I9ff7062677040fd35d285373cca19515a0cb921f
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2021-04-20 17:25:43 +03:00
Juha Vuolle
f690a5b5d7 Add coin platform config for QtSensors
QtSensors shall be released in Qt 6.2. The cmake port for the QtSensors
is in the making and initial version should be ready soon.

Task-number: QTBUG-92502
Change-Id: I0006d24447334474ae5578ce05a6dcb195e8ad49
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2021-04-20 16:25:40 +02:00
Toni Saario
02cc128cdc Enable macOS target on ARM HW on all modules
Change-Id: I3528a2bca79f20345926e61f3eef715fc63d84e8
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2021-04-20 17:25:36 +03:00
Alexandru Croitor
1306da8f92 macOS: Build universal Qt for macOS
Build a universal macOS targeting Intel x86_64 and Apple Silicon
arm64 using the fat library technique. It will be our new Packaging
configuration for macOS.

Rename the Id of the configuration to
'macos-latest-xcode-universal-packaging-build'.

x86_64 is the main config test architecture.

The arm64 slice of the Qt build lacks certain functionality:
 - no qdoc, lupdate, etc due to missing arm64 llvm packages
 - no postgresql and odbc sql plugins due to missing
   arm64 3rd party libraries
 - no openssl due to missing arm64 library
 - no JIT support in QtQml, due to limitations in the current fork
   of the javascript engine

Task-number: QTBUG-85447
Change-Id: If2a70f192a54d6f98137e05e5b938d118b6d1d1d
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2021-04-20 13:32:31 +02:00
Qt Submodule Update Bot
c9eba7d99f Update submodules on 'dev' in qt/qt5
Change-Id: I5768d7983e6c75a9be576ab91c8fdebe0367b836
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-04-20 14:32:14 +03:00
Heikki Halmet
aa5112af99 Add Red Hat 8.2 to CI
Red Hat 8.2 is the latest version with extended update
support. In the end Red Hat 8.2 will replace CentOS 8.3

Task-number: QTQAINFRA-4322
Change-Id: Iaa2ef452e7e6608349ba7438bbc5d25ddb35fa2a
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2021-04-20 08:38:20 +03:00
Johanna Äijälä
03821e82a5 Provisioning: Fix Squish for Qt6 on macOS
Add correct Squish package to the 'squish_for_qt6' location.

Pick-to:6.1
Pick-to:6.0

Change-Id: Ib997092a5d6350d9b7298d7cc8baf5a2afaca702
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2021-04-20 04:44:11 +00:00
Qt Submodule Update Bot
2737415067 Update submodules on 'dev' in qt/qt5
Change-Id: I6ab6399438dca0ad9e1957e0055159a069912e4e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-04-20 05:09:23 +03:00
Qt Submodule Update Bot
f3fafc2591 Update submodules on 'dev' in qt/qt5
Change-Id: I3ee4027abb4f1571ce9a66a4c7e8beebccdf68ef
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-04-19 21:04:53 +03:00
Heikki Halmet
9200ee7384 Provisioning: Upgrade MSVC 2019 version to 16.9.4
Pick-to: 6.1
Pick-to: 6.1.0
Pick-to: 6.0
Task-number: QTQAINFRA-4117
Change-Id: Iefb5c8b97b3f56d9cdb358dbbf70d4c9de1b7d1b
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2021-04-19 13:01:38 +03:00
Heikki Halmet
a4b61379ca Provisioning: Resize ulimit value for open files
Linker for Qt Webengine builds needs to open multiple files.
Without this it will hit the limit

Pick-to: 6.1
Pick-to: 6.1.0
Pick-to: 6.0
Task-number: COIN-699
Change-Id: I53b8c38a4f719714971ca6a4b65349716a873170
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2021-04-19 13:01:22 +03:00
Qt Submodule Update Bot
e468db267a Update submodules on 'dev' in qt/qt5
Change-Id: I0c79807c5172b19ea9698c3c85ef41d3b8d1c170
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-04-16 20:52:15 +03:00
Alexandru Croitor
002b6f075c CMake: Use qtbase's version as the top-level project version
This avoids the need to bump the qt5.git project version when
branching the next minor Qt version.

Pick-to: 6.1 6.0
Task-number: QTBUG-92861
Change-Id: Ib20ab614caefece00bd9e0172d9269077239ba6a
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2021-04-15 13:27:10 +02:00
Qt Submodule Update Bot
cfd7838615 Update submodules on 'dev' in qt/qt5
Change-Id: Ic52240c1f49a55a0bff0f01965dc942dbde8cc4d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-04-15 07:31:36 +03:00
Qt Submodule Update Bot
29f45fdb25 Update submodules on 'dev' in qt/qt5
Change-Id: I081ea134beb3d1f4ca3abfeee9b6cbe620860e8a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-04-14 14:43:51 +03:00
Jani Heikkinen
bba6c1bd70 Revert "Add qttools as additional dependency to additional libraries"
This reverts commit 919aa17249.

Reason for revert: additional libraries will be part of qt5.git build -> we don't need to have qttools as dependency there anymore

Change-Id: If77278c030be961d2282ff5c049d5ec6b03a578b
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
2021-04-14 09:19:30 +00:00
Qt Submodule Update Bot
7a7c685f3b Update submodules on 'dev' in qt/qt5
Change-Id: I62923f0c4d5f70d57a709c787052a1cb7109e958
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-04-14 06:24:19 +03:00
Qt Submodule Update Bot
7193f979a9 Update submodules on 'dev' in qt/qt5
Change-Id: Ic5526cfb4a09bb2a36e524c817a8513a30fe34f7
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-04-13 22:27:59 +03:00
Assam Boudjelthia
53fc7d424d Update NDK to r22b
Qt quick 3D apps crash because of a bug caused by NDK r21
https://github.com/android/ndk/issues/1148, NDK r22b solves
the problem.

Pick-to: 6.1 6.1.0
Task-number: QTBUG-91782
Task-number: QTBUG-92075
Change-Id: I92098c26f3bd9fcfc342ced42c9a81f1e34af8d6
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2021-04-13 12:19:04 +00:00
Heikki Halmet
ca14882321 Provisioning: Install prebuilt OpenSSL Android
OpenSSL 1.1.1 can't be build against Android NDK 22. Current OpenSSL
prebuilt was made against NDK 21.

Pick-to: 6.1.0
Pick-to: 6.1
Task-number: QTBUG-92075
Change-Id: I0e8a3017a9482ef269d736a8702b29b6bec1c2b2
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2021-04-13 12:19:04 +00:00
Tor Arne Vestbø
4a9d291ca6 Cache list of submodules
Otherwise running cmake with QT_BUILD_SUBMODULES set in the environment
would not persist for later cmake runs without the environment set,
resulting in trying to reconfigure with every single available module.

Change-Id: I85e57b16fdc8e51cae8fff083c7a7536b0ed16f1
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2021-04-13 14:19:04 +02:00
Heikki Halmet
027f8ccb08 Provisioning: Add Vulkan installation for Ubuntu 20.04
Vulkan is needed by examples

Pick-to: 6.1
Pick-to: 6.1.0
Pick-to: 6.0
Task-number: QTBUG-92545
Change-Id: I2f814e452c88c04919b26eb42e90bac18356bbe7
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
2021-04-13 10:02:22 +00:00
Qt Submodule Update Bot
546c9fb3c1 Update submodules on 'dev' in qt/qt5
Change-Id: I0a0c782c38eccf3bc83e8c4372011a7f366c0f80
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-04-13 10:34:06 +03:00
Toni Saario
00069e6eaa Add a ARM64 macOS target
This patch adds a macOS target that is run on the ARM64 macs.

Task-number: QTQAINFRA-4012
Change-Id: I255a288551846ae3328f614b64668fdc5ede2391
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2021-04-13 09:34:00 +03:00
Qt Submodule Update Bot
00e5688e28 Update submodules on 'dev' in qt/qt5
Change-Id: I901b17a762cfaee88c47a6125b23f761ad5a7b93
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-04-13 06:20:10 +03:00
Matti Paaso
2140c07299 Fix qt-creator license check
Pick-to: 6.1
Change-Id: I7c9df1313075294ddfbfa8ceb14be267eacc3d2b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-04-12 07:21:29 +00:00
Toni Saario
32579bc3c4 Add conan to path
Pick-to: 6.1
Change-Id: I90e028409f606a703fd9b567a221f3f946f11d61
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2021-04-12 06:49:25 +00:00
Toni Saario
3802e21afe Enable conan revisions mode
Pick-to: 6.1
Change-Id: I0fb9d6943cf0e6e54f631314a67348f703c31e41
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2021-04-12 06:49:23 +00:00
Toni Saario
7381cbeca8 Update windows git version
Older git version does not allow fetching specific revisions.
This makes it impossible to fetch the integrations revision of
the repository.

Pick-to: 6.1
Change-Id: I513b0d1abb097d139f730ef0cdf2577b9d02e9f8
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2021-04-12 06:49:22 +00:00
Toni Saario
f83567b7f5 Provision conan on ubuntu 18 and macos 11
Pick-to: 6.1
Change-Id: Ie11e8bb2b39acd3ab6229cb211c37500cbb7ed77
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2021-04-12 06:49:19 +00:00
Heikki Halmet
26c97222c1 Provisioning: Install Nodejs using pkg instead of Brew
Openssl is one of Nodejs dependencies when installing it via
Homebrew which is causing issues with actual openssl source build during
provisioning

Pick-to: 6.1
Pick-to: 6.0
Pick-to: 6.1.0
Pick-to: 5.12
Task-number: QTQAINFRA-4402
Change-Id: I711c0f2bb7faebb3e5cbe2f415f34b2ac2d38a66
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2021-04-11 15:28:55 +00:00
Jani Heikkinen
9980240e33 Drop Ubuntu 18.04 target from qtbase.yaml as well
Pick-to: 6.1
Change-Id: I033d8aa10b69a110fb1f51fd0620deba7ac559a9
Reviewed-by: Toni Saario <toni.saario@qt.io>
2021-04-09 14:42:15 +03:00
Jani Heikkinen
7a8094dc9d Drop unnecessary ci and packaging configurations
- Drop Ubuntu 18.04 from CI; we aren't supporting it as development host
in Qt6. And we aren't using its prebuild binaries anywhere
- Drop 'Packaging' feature from QNX builds; we aren't packaging those
- Drop 'Packaging' feature from openSUSE builds; we aren't packaging those

Pick-to: 6.1
Change-Id: Ic5c6e0e1c480946380cbcf4b01133caffe7a71e0
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2021-04-09 10:42:15 +03:00
Matti Paaso
9ad3578bc2 Add qt-creator platform configurations
Pick-to: 6.1
Task-number: COIN-491
Change-Id: I18b70a7157931f9fe0d42abf71f1bab6de6199c3
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-04-09 05:07:57 +00:00
Qt Submodule Update Bot
b3db9e5263 Update submodules on 'dev' in qt/qt5
Change-Id: I7ade10e3498aeaf121d1da1a066ceda3a0d05669
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-04-09 05:26:11 +03:00