Commit Graph

4425 Commits

Author SHA1 Message Date
Alexandru Croitor
ad31ece050 CMake: Enable CMake builds for qtwebsockets
Change-Id: I53a73461a8a93e33f07b8853a3ff8aa4ca27b573
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2020-03-24 23:05:27 +01:00
Qt Submodule Update Bot
8bd018cd77 Update submodules on 'dev' in qt/qt5
Change-Id: Ibd108ff2bcbe20e8553ac28d271339943b7add0b
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2020-03-24 07:12:09 +01:00
Qt Submodule Update Bot
bee6bf85d9 Update submodules on '5.15' in qt/qt5
Change-Id: I5219e3ecc5c3dc4d7c5c396e423f376c7f488c5d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-03-23 23:46:45 +01:00
Tony Sarajärvi
2b7355e69c Update MinGW 7.3.0 to Mingw 8.1.0
Task-number: QTQAINFRA-3304
Change-Id: I4a962c112f4925224e91c08117c7324112d70729
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
2020-03-23 14:53:02 +00:00
Qt Submodule Update Bot
f164974aef Update submodules on '5.14' in qt/qt5
Change-Id: I1b90e5a2092976a5c6e5ad6e0dffef1f365790c3
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-03-22 22:31:00 +01:00
Qt Submodule Update Bot
2bf281229a Update submodules on '5.15' in qt/qt5
Change-Id: I5a592a5d5d5fe83b710eee6d591dc60d0207c943
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-03-22 14:12:25 +01:00
Qt Submodule Update Bot
e514b5913a Update submodules on '5.15' in qt/qt5
Change-Id: Id62752c7cfc871751d9320460bb2fdca55639d5e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-03-21 17:20:26 +01:00
Qt Submodule Update Bot
e90ca63f94 Update submodules on '5.14.2' in qt5
Change-Id: I8da2e10658ec25db0822eba56ccfe1e12b1868f9
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2020-03-21 10:04:19 +00:00
Kai Koehne
58f8324458 Do not pass -qt-zlib to cross-builds
Commit 89fceff6a4 added -qt-zlib to all Windows configure lines.
This also affected QNX. Instead, only pass -qt-zlib to native builds.

Fixes: QTBUG-82254
Change-Id: I116cae82ab971170e633b5a8602dd573407be96f
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2020-03-21 08:05:56 +01:00
Qt Submodule Update Bot
79e164fc72 Update submodules on '5.14.2' in qt5
Change-Id: I4ba4dfe103d1875b04507f463e780db680d1e17a
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2020-03-21 07:05:50 +00:00
Alexandru Croitor
37326dac27 CMake: Enable CMake builds for qtquickcontrols2
Change-Id: I0357d9c3a166eb0679d6dd36c84537397eeda212
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2020-03-20 18:08:15 +01:00
Lorn Potter
939c014039 Provisioning: Bump emscripten version to 1.39.8 on Windows
Task-number: QTQAINFRA-3577
Change-Id: I63b06a8ac0b4a7233ed9031c7354f3b355c9f8ad
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
2020-03-20 08:09:48 +10:00
Simon Hausmann
00b3c634cf Update Yocto SDKs to Warrior
This is needed to include various fixes to allow building the CMake port
against the contained sysroots.

Change-Id: I42fc055a0e1e2abe5567b9ac3e1bc5e20fcd9900
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2020-03-19 21:52:59 +01:00
Qt Submodule Update Bot
4ad5f4ad49 Update submodules on 'dev' in qt/qt5
Change-Id: Ia8f970fbeab7ec1bbe05b68f6b645cbf7be883b4
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2020-03-19 19:03:12 +01:00
Qt Submodule Update Bot
ee12ff9881 Update submodules on '5.15' in qt/qt5
Change-Id: Ib79d685a5235bf1963b04ada786295221a83b1ca
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2020-03-18 22:18:19 +00:00
Leander Beernaert
0739a54a4b Read module list from .gitmodules
This patch mimics the behavior of qt.pro, where the module list is
extracted from the .gitmodules file and then topologically sorted
based on the modules dependencies.

This patch also introduces a small check to make sure all the required
dependencies are met and will be built.

Change-Id: Idd3df9b618805ca0b2347eac57aaa39c1bcdb3dd
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit b01225fb32)
Reviewed-by: Leander Beernaert <leander.beernaert@qt.io>
2020-03-18 21:26:26 +01:00
Kevin Funk
a59826003e Start the CMake superbuild
Also import and use ECMOptionalAddSubdirectory.cmake to add other
module's as subdirectories, in case the directories exist. Additionally
this module allows to disable the build of submodules by passing e.g.
BUILD_qtsvg=OFF.

This probably needs more though on how to hande the intermodule dependencies,
but it's a start.

Task-number: QTBUG-75582
Change-Id: Ic3de9711d9b865b2d96bdaee0089f570408b9693
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
(cherry picked from commit 7509458d5f)
Reviewed-by: Leander Beernaert <leander.beernaert@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2020-03-18 21:26:20 +01:00
Alexandru Croitor
34bbbedb78 CMake: Enable CMake builds for qtimageformats and qtgraphicaleffects
Change-Id: I21415e0ec7a0dfdd4f2b61d2add1adb71095bd16
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2020-03-18 21:26:05 +01:00
Jani Heikkinen
da2fcb2958 Update qtwebengine
Task-number: QTBUG-82894
Change-Id: I40cb18037a10cbf4205d6c2a6fbbefbcc259bc91
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
v5.15.0-beta2
2020-03-17 07:18:47 +02:00
Alexandru Croitor
7c0b475ca6 Enable CMake builds for qtdeclarative
Change-Id: I89654288e6d459f7bd7d9e4c2dac09ecfb0f3a95
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2020-03-13 19:25:52 +01:00
Qt Submodule Update Bot
08c21b092d Update submodules on '5.14.2' in qt5
Change-Id: I4ac85047efe6589405a96ceb9bcf42b9ef79b2d1
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2020-03-13 04:57:53 +00:00
Morten Johan Sørvig
10e843566e Provisioning: Bump Emscripten version to 1.39.8
The upstream URLs have changed:
 - emscripten packages now at github.com/emscripten-core/emscripten/archive/
 - binaries (llvm/binaryen/node) now at storage.googleapis.com/webassembly/emscripten-releases-builds/

Add support for unpacking tbz2 files. Keep caching as
before, update .emscripten config file with new paths.

Task-number: QTQAINFRA-3577
Change-Id: I53e72f19d3eefa0e2155493db4f93c8730c60334
Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
2020-03-12 20:05:18 +01:00
Qt Submodule Update Bot
fd2b713a87 Update submodules on '5.15' in qt5
Change-Id: I9c8617253ea6355c42b04cea4018e5ddf239f64f
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2020-03-12 19:05:13 +00:00
Jani Heikkinen
fe45a4ea86 Merge remote-tracking branch 'origin/5.14' into 5.14.2
Change-Id: Id4db926300c54fc5fed9d48584766addc5813833
2020-03-10 10:22:49 +02:00
Alexandru Croitor
e9c2be7b6a Update provisioned CMake version to 3.17.0-rc2
We want to test debug_and_release builds with CMake as soon
as possible.

Change-Id: I7d4c0a4e33adc26129844ff34ea8df6b149e184f
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2020-03-09 23:42:21 +01:00
Alexandru Croitor
6ff1dcfbd3 CMake: Change iOS builds to build in Release configuration
Apparently standalone Debug iOS builds are not supported in qmake
at the moment as per QTBUG-71990.

While we keep the same configure.json error reports for both qmake and CMake
it's simpler to switch the config to Release.
Once we get Ninja Multi-Config in Coin working, we can switch to
debug_and_release.

Change-Id: I406012918fd402ad0ff29bbdc151e247699eea72
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-03-09 21:15:04 +01:00
Alexandru Croitor
dbd18fc0c5 Re-enable iOS CMake builds
This reverts commit dad8e600bd.

Change-Id: I6aab4d5818e4cbd3ec83ad6d57fa0bdd2348bf35
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2020-03-09 13:00:29 +01:00
Tony Sarajärvi
3b264301b0 Update openSUSE to 15.1
Task-number: QTQAINFRA-3455
Change-Id: Ie795f19c26ab0c42693388696edb344b4fa121a6
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Liang Qi <liang.qi@qt.io>
2020-03-09 10:50:38 +00:00
Qt Submodule Update Bot
bdaa28c45f Update submodules on '5.14' in qt/qt5
Change-Id: I216fbf259c1b29d5526131e061bcd40a2b7673e6
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-03-07 22:31:16 +01:00
Alexandru Croitor
e1bc1c4885 Remove vcpkg provisioning and configure arguments
Now that qtbase supports building bundled 3rd party libraries, we
should have no need for vcpkg in Coin anymore.

Change-Id: I7aa7b0323416b60ffb0cd70eec287e5f25963d9a
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2020-03-06 06:25:50 +01:00
Liang Qi
2a405a8df3 Update submodules on 'dev' in qt/qt5 manually
which is based on the last qtqc2 dev integration,
https://testresults.qt.io/coin/integration/qt/qtquickcontrols2/tasks/1583152923

Change-Id: Ide29e6d8e83e2e6afe9a2305039e6c8e9d1eecd9
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Liang Qi <liang.qi@qt.io>
2020-03-05 08:56:44 +01:00
Konstantin Tokarev
4c880b3aff Provisioning: install dwz 0.13 to RHEL 7.6
It is used for compression of QtWebKit debug info, saving
about 1Gb (~40%) for non-compressed debug file of
libQt5WebKit.so, and ~50% of 7z-compressed debug package.

Version 0.12 provided in RedHat devtoolset exposes a bug
when applied to QtWebKit debug info:

https://sourceware.org/bugzilla/show_bug.cgi?id=24251

Change-Id: I0395aadfb7babbbc150f367f8b5dd296dc6d2064
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2020-03-05 04:12:22 +03:00
Konstantin Tokarev
7ba8c15d79 Update platform_configs for QtWebKit
* Add 64-bit MinGW config
* Don't use DisableTests for 64-bit MinGW, as it's necessary for at
least for the purpose of JS engine smoke check
* Sync configure flags with qt5.yaml, but not enable forced debug info
which causes build issues for both 32-bit and 64-bit configs

Change-Id: Iad5ff1459f8b39f17223da75b3319ab0cfc033d8
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2020-03-05 04:12:11 +03:00
Konstantin Tokarev
b7b6e31d47 Provisioning: Install QtWebKit dependencies on Ubuntu 18.04
Change-Id: Ib9a142ed6641436669c31ae8489ab9c89576e77a
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2020-03-05 04:12:01 +03:00
Konstantin Tokarev
b263f0a2d1 Provisioning: Install Conan packages for VS2019
Change-Id: Ibbee96ea7ad9e054e1521c897206c9863acc9c08
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2020-03-05 04:11:50 +03:00
Qt Submodule Update Bot
d3c777f18e Update submodules on '5.14' in qt/qt5
Change-Id: I716a8496b64c70be454ff36edb936bc9f11a3df5
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-03-04 22:31:21 +01:00
Qt Submodule Update Bot
b601579dda Update submodules on '5.15' in qt/qt5
Change-Id: I14c3b2f4040378851ed9f7995c57ddf77948aa94
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2020-03-04 09:11:28 +01:00
Qt Submodule Update Bot
fd23ab598e Update submodules on '5.14' in qt/qt5
Change-Id: I0800d3bc95f5010ce0045f6fa1115288a3009bee
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-03-01 22:31:01 +01:00
Heikki Halmet
9e97db2714 Add missing -qt-zlib configuration parameters for MSVC2019
Change-Id: Ic0b6842b879ecc2951ae5aab3380c5d6e8343f97
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2020-02-28 15:52:52 +02:00
Liang Qi
08e63423e2 Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
	.gitmodules
	coin/platform_configs/default.yaml
	coin/platform_configs/flashing-wizard.yaml
	coin/platform_configs/qt5.yaml
	coin/platform_configs/qtbase.yaml
	coin/platform_configs/qtconnectivity.yaml
	coin/platform_configs/tqtc-qt-config-gui.yaml
	coin/provisioning/qtci-linux-SLES-15-x86_64/02-zypperpackages.sh

Change-Id: I7af8a52d8b4452211982d86105dafacdd3d845c0
2020-02-28 13:49:10 +01:00
Kari Oikarinen
3c0578e0bf Adjust submodule branches 2020-02-28 09:17:28 +02:00
Heikki Halmet
97aa53410e Add MSVC 2019 as packaging target and remove msvc2017 verification
Change will enable tests for MSVC 2019 and replace MSVC2017 as packaging
target.

Task-number: QTQAINFRA-2875
Task-number: QTQAINFRA-3432
Change-Id: Ifef3bd02b5fae6225a6c0ecdc412edbb488e25b1
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2020-02-27 20:06:22 +02:00
Andy Shaw
8a4f808649 Set qtgraphicaleffects essential as qtquickcontrols2 depends on it
Change-Id: I0a157f71ed8d5132b8238691cbb0f4aa57b04976
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2020-02-25 13:09:06 +00:00
Liang Qi
4ade81d4dd Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: Ib51a6d362bf9cc5f6e6f56feadfe264216e24223
2020-02-25 09:51:20 +01:00
Qt Submodule Update Bot
c36c046f1a Update submodules on '5.15' in qt/qt5
Change-Id: If1114ea254b242d6b0f5e0dbdb1bd66155716f31
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
v5.15.0-beta1
2020-02-25 08:24:28 +01:00
Qt Submodule Update Bot
1b71d3f62e Update submodules on '5.14' in qt/qt5
Change-Id: I1c6dda72bc12d36c95867cfd6f89df057c8b128b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-02-24 17:50:37 +01:00
Qt Submodule Update Bot
35e71e9d2c Update submodules on '5.14' in qt/qt5
Change-Id: I85b462d5ac666754ccd789ad4c8b7be4ee3e1e4e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-02-23 09:21:26 +01:00
Konstantin Tokarev
b73e61a458 Provisioning: update Conan and Conan packages to latest versions
Task-number: QTQAINFRA-3556
Change-Id: If9c600a6bb3aae893924f9372c8b248d3e58f887
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2020-02-22 12:01:44 +03:00
Heikki Halmet
7e126af82f Provisioning: Update GCC to version 9.2 for Ubuntu 18.04
GCC bug which breaks Webengine build should be fixed in GCC 9.2

Task-number: QTQAINFRA-3534
Change-Id: Ie0df7c67e0e96cca5632bcd0e6a3db822fcbffbe
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2020-02-19 11:01:15 +02:00
Liang Qi
769362560f Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I604824d346aed06b2e4e62b401fdc1d7040145c2
2020-02-16 12:04:36 +01:00