Commit Graph

3979 Commits

Author SHA1 Message Date
Allan Sandfeld Jensen
ca914bdbf3 Fix qtwebwengine.yaml
Missing an initial separator

Change-Id: I1f447963fbaa93027cfffd7c320efc69ea4a1107
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2020-04-21 16:46:47 +02:00
Allan Sandfeld Jensen
9b7a95964d Add qtwebengine.yaml
We can't build the wasm version of qtbase any longer

Change-Id: I7436640941702ba2479c7e73f3d1d9ccaf2e7709
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2020-04-21 10:02:36 +02:00
Volker Hilsheimer
82ed571cde Add Pick-to footer for cherry-pick bot to commit template
Change-Id: Idec00573bdbebda4d3b3481eee480c91c5d8d1de
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2020-04-20 11:04:27 +02:00
Qt Submodule Update Bot
f63b095561 Update submodules on 'dev' in qt/qt5
Change-Id: Ie35c05cb101d3a5e44ec2fbe5cb8bad2e16f785a
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2020-04-09 08:08:51 +02:00
Qt Submodule Update Bot
93f50f13fe Update submodules on 'dev' in qt/qt5
Change-Id: I67165031f648c6e4f662e832635c4e55265a0c5e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-04-09 00:00:09 +02:00
Qt Submodule Update Bot
ae846322ea Update submodules on 'dev' in qt/qt5
Change-Id: Ib9c73befcbb68f5dbf4abb8931bfee41827c8e05
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-04-08 00:00:23 +02:00
Alexandru Croitor
da26e954de CMake: Pass location to custom OpenSSL 1.1 directory in Coin
Needed for enabling all the various OpenSSL classes in Qt.

Change-Id: Ic20ab464552317a2753ae0e35043e16cc6c60ab3
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2020-04-07 17:42:51 +02:00
Qt Submodule Update Bot
d241778ce9 Update submodules on 'dev' in qt/qt5
Change-Id: I915cc1d265b84df6bf8b01012f8ff4e37a1c0860
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2020-04-07 15:16:07 +02:00
Alexandru Croitor
a86d895287 CMake: Enable CMake builds for qt5compat
Change-Id: I939f42e03cb76ccf8d984ee0f856c44049679794
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2020-04-07 14:09:09 +02:00
Qt Submodule Update Bot
06f9c8cc3a Update submodules on 'dev' in qt/qt5
Change-Id: I96c17784a1c9cf24552a68de4e3995095fb14999
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-04-04 23:59:58 +02:00
Lorn Potter
f5862a11f4 Provisioning: Bump emscripten version to 1.39.8 on Windows
(cherry picked from commit 939c014039)

Task-number: QTQAINFRA-3577
Change-Id: I5842158c0a11b29791fcb97d4523467de899e1e2
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2020-04-04 08:15:38 +02:00
Morten Johan Sørvig
922cca96bf Provisioning: Bump Emscripten version to 1.39.8
(cherry picked from commit 10e843566e)

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: I239aaf89bc199e5f6267519861f9b2ab54f10b0f
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2020-04-04 08:15:13 +02:00
Qt Submodule Update Bot
b6f12a0c33 Update submodules on 'dev' in qt/qt5
Change-Id: If5d70aa1a51eb7b8481cae5659e7cd2d9d66d45c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-04-04 03:23:30 +02:00
Qt Submodule Update Bot
38f80e73f6 Update submodules on 'dev' in qt/qt5
Change-Id: I8d07db2c521517a5770fae17dbda59abb5510019
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2020-04-03 22:04:30 +02:00
Qt Submodule Update Bot
c63db0ef02 Update submodules on 'dev' in qt/qt5
Change-Id: I1c2002fdb706af67581b2030119c894db89dcc24
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-04-03 00:00:30 +02:00
Qt Submodule Update Bot
941c3e487f Update submodules on 'dev' in qt/qt5
Change-Id: I6eb97a9587376a9d7bc96933825c2cdde0841197
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2020-04-02 17:29:45 +02:00
Alexandru Croitor
e1a4d6bf17 CMake: Enable CMake builds for qtwayland
Change-Id: I2f8e762a7e440e1f59591569910a2f68cf0e7c3e
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2020-04-02 10:00:33 +02:00
Qt Submodule Update Bot
e94816937f Update submodules on 'dev' in qt/qt5
Change-Id: Iaf5efa53ddb01205d73bd6bf37f06e62abffa39c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-04-02 00:00:06 +02:00
Lars Knoll
a3e33df7f6 Completely remove QtScript from qt5.git
It doesn't even compile against c++17 anymore (uses auto_ptr),
and the JavaScript engine is now more than 10 years outdated.

Change-Id: I56cc36aa5aeb4dfa6b19b699886f6e34fe1eecbd
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2020-04-01 22:36:01 +02:00
Qt Submodule Update Bot
3a64559f68 Update submodules on 'dev' in qt/qt5
Change-Id: Iea05dbac28cd0c96da47ac2647c65ba3c9639d79
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-04-01 00:00:10 +02:00
Qt Submodule Update Bot
a9d743de49 Update submodules on 'dev' in qt/qt5
Change-Id: I696f0591917930f910c50833601d482b70f2a2d1
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2020-03-31 14:42:51 +02:00
Leander Beernaert
c5c56d2548 CMake: Add missing quote in qt_attribution.json
Change-Id: I360f5311373265843234c45bd8dd24f6499a5b99
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2020-03-31 11:30:05 +02:00
Qt Submodule Update Bot
0e0cba3eb9 Update submodules on 'dev' in qt/qt5
Change-Id: Iadfcc815e03910d54f5839655773a5a30567c409
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-03-29 09:14:12 +02:00
Qt Submodule Update Bot
2aeffc21fa Update submodules on 'dev' in qt/qt5
Change-Id: Iab567fb530e5e7e0aa04e601c90bed0aca55291f
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2020-03-28 12:27:58 +01:00
Qt Submodule Update Bot
6c21c209c4 Update submodules on 'dev' in qt/qt5
Change-Id: Idcdae073b28e5208904f077bf897d9759703e885
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2020-03-26 15:23:50 +01:00
Alexandru Croitor
9837c866ab CMake: Enable CMake builds for qttools
Change-Id: I84a48022882623c09278de34dd4a0be92e05143e
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2020-03-26 13:20:14 +01:00
Alexandru Croitor
570fcd9c4b CMake: Enable CMake builds for qtshadertools
Change-Id: Iaa9ff0490fee0eb31ddc304a0e9df5c1432f412d
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2020-03-26 13:03:53 +01:00
Qt Submodule Update Bot
e5452d315b Update submodules on 'dev' in qt/qt5
Change-Id: I67f4a48809b4801cd2d9ec2caa7f3f6e61525ed2
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2020-03-25 23:17:27 +01:00
Qt Submodule Update Bot
f2e6ef53fb Update submodules on 'dev' in qt/qt5
Change-Id: I41e1ac0b9a6f2ee59d9600c858e0743ef052970c
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2020-03-25 15:33:47 +01:00
Qt Submodule Update Bot
1670345722 Update submodules on 'dev' in qt/qt5
Change-Id: I6627f77845a2aa44752bc1d26c540920a85e6ba6
Reviewed-by: Liang Qi <liang.qi@qt.io>
2020-03-25 09:43:41 +01:00
Alexandru Croitor
1b69f59fb7 CMake: Enable CMake builds for qtnetworkauth
Change-Id: I9a3defc794d899e7f381452050485661011ef881
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2020-03-24 23:05:27 +01:00
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
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
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
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
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
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
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
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
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
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