lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-03-18 02:06:20 +08:00
Code Issues Packages Projects Releases Wiki Activity
5,244 Commits 120 Branches 272 Tags
5b22f8ec2e4fbb58e362b709ee82f2dbd8afdfd3
Commit Graph

5244 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Heikki Halmet
657413a101 Pre-provisioning: Install MSVC 2015 update 3 to Tier1 
Task-number: QTQAINFRA-3626
Change-Id: I7f2077af4f399c1ba607bbd3f772856c953029f4
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
 2020-03-30 14:55:40 +03:00
Heikki Halmet
5403d3259c Provisioning: Add git installation for Windows 10 x86 
RTA needs git

Change-Id: I1b295b364376aff2e548b2376e920cc513fac30c
Reviewed-by: Matti Paaso <matti.paaso@qt.io>
 2020-03-30 14:55:40 +03:00
Heikki Halmet
5cf6725dbe Provisioning: Disable notifications 
Having notifications enabled will eat VM resources (CPU).

Change-Id: I2af7fbc7afeb9436164915353998abf219d495ed
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
 2020-03-30 13:55:40 +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
2e7ba38d18 Update submodules on '5.14.2' in qt/qt5 
Change-Id: Id700b8f69bc185d9a6fff4298409126c27b88448
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
v5.14.2 		2020-03-28 06:30:29 +00: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
Heikki Halmet
704e5d5635 Update Windows 10 x86 to version 1909 
These are also updated to tier1 image:
msvc 2017: 15.9.21
msvc 2017 build tools: 15.0 (26228.10)
msvc 2019: 16.4.6
msvc 2019 build tools: 16.4.6

Change-Id: I41ae0e287ccf74183438d7a7bff639fd78e86e7a
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
 2020-03-26 11:37:38 +02: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
2d524e4bcc Update submodules on '5.14.2' in qt/qt5 
Change-Id: I6035e0ffe3afafe50b623637324c83e507bee771
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
 2020-03-25 18:09:48 +00: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
7264214147 Update submodules on '5.14' in qt/qt5 
Change-Id: Ic3049794ed566ef0bb889d2312a358c07c0e4328
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2020-03-25 09:55:50 +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
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