Commit Graph

4648 Commits

Author SHA1 Message Date
Qt Submodule Update Bot
80b5b60a5a Update submodules on 'dev' in qt/qt5
Change-Id: Ibb59bafe553eb0ca055d8d4275f476d87b4c46c9
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-05-05 10:06:13 +03:00
Qt Submodule Update Bot
f32e311b13 Update submodules on 'dev' in qt/qt5
Change-Id: I0cc9ad6d4dae1049b5d5ccba84afa4ea1ff7dbc2
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-05-05 02:16:11 +03:00
Qt Submodule Update Bot
c94ae9ad53 Update submodules on 'dev' in qt/qt5
Change-Id: I32545ca7ab23266ecbf9ce26593a40bbac9a87cc
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-05-04 11:29:13 +03:00
Qt Submodule Update Bot
1b00e13ec8 Update submodules on 'dev' in qt/qt5
Change-Id: I76b03c8a5e6fdd3da47e35de6ea37b5f7579970a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-05-04 03:59:53 +03:00
Qt Submodule Update Bot
97f41c2fef Update submodules on 'dev' in qt/qt5
Change-Id: I2d83b0da164cfea2694b51f32069698d0c6780af
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-05-03 19:38:04 +03:00
Qt Submodule Update Bot
2fc400fed7 Update submodules on 'dev' in qt/qt5
Change-Id: Ifb8d58ff4677c73e5b2a0ac381a99f9bc4351dff
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-05-01 15:21:46 +03:00
Qt Submodule Update Bot
453cf99c90 Update submodules on 'dev' in qt/qt5
Change-Id: I727a0d4b9c1cc665acf9aaf5c03d168f63646398
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-05-01 10:02:16 +03:00
Qt Submodule Update Bot
d38a5d0044 Update submodules on 'dev' in qt/qt5
Change-Id: I8774af63fd1e96cd2e95288170a4510c3799f3ba
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-04-30 20:24:36 +03:00
Cristian Adam
c653958301 Update QDoc libclang to 12.0
Task-number: QTBUG-93203
Change-Id: I58b9af361b8e02b7210286ff3cfd6ca07ebb9610
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2021-04-30 14:37:00 +02:00
Heikki Halmet
6ae5052d57 Provisioning: Upgrade python 3.6 version to 3.6.2
typing.NoReturn is not included in python 3.6.1 version. We need at
least 3.6.2 version

Pick-to: 6.1
Pick-to: 6.0
Task-number: QTQAINFRA-4433
Change-Id: I040e72e253852c7789d4f9e781d18e6b9a431a50
Reviewed-by: Dan Ackers <dan.ackers@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2021-04-28 12:47:10 +03:00
Qt Submodule Update Bot
81bb861060 Update submodules on 'dev' in qt/qt5
Change-Id: Ia193a750ec32f83192170066c2da078f31d583c2
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-04-28 08:43:14 +03:00
Alexandru Croitor
b3a0469100 CMake: Re-add Linux static config to keep build coverage
We want at least one config that ensures static host Qt builds
work in the CI, even if no tests are built.

Amends bead5e8720

Task-number: QTBUG-87580
Change-Id: I091e85ca40faef30ddad57e2a392d65197a47027
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2021-04-27 20:09:30 +02:00
Alexandru Croitor
bead5e8720 Build minimal subset of tests in desktop static builds
New cmake_platforms_static_tests.yaml file will be included in repos
that support building and running a minimal subset of tests built
against a static Qt.

Currently it's limited to qtbase.

Moved existing 'linux-SLES static' config into this new file and
also added a macOS and Windows config.

Skipped specifying the PostgreSQL lib path for Windows and macOS because
the plugin gets automatically linked into tst_moc, but the test build
phase doesn't actually call find_package for PostgreSQL and the build
system generation fails.

Similary skipped specifying the openssl lib location for macOS,
because the module_includes cmake auto test fails to find the
WrapOpenSSLHeaders package.

Explicitly tag iOS static config with DisableTests. The instructions
already skipped building tests for iOS, but it's better to be explicit
and update the instructions not to do that anymore.

Pick-to: 6.1
Task-number: QTBUG-87580
Change-Id: I0d38a0ad055c92646609202691aeb8db29689f5a
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2021-04-27 15:18:22 +02:00
Heikki Halmet
9e0334389b Provisioning: Fix nodejs installation
Pick-to: 6.1
Pick-to: 6.0
Pick-to: 5.15
Pick-to: 5.12
Task-number: QTBUG-93178
Change-Id: I27f4b1aa6f382cb6c9cc97f960fe1d0b81e47fbd
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2021-04-27 12:36:38 +03:00
Qt Submodule Update Bot
efe7e1f958 Update submodules on 'dev' in qt/qt5
Change-Id: Iabc6447679ee0bd1729c36457c6e5b585be9fcf4
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-04-27 10:56:59 +03:00
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