lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-02-24 16:05:36 +08:00
Code Issues Packages Projects Releases Wiki Activity
3,748 Commits 119 Branches 271 Tags
3ba8bdeda0fd23bec9de10cb4cf962b50a535af6
Commit Graph

3748 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Leander Beernaert
3ba8bdeda0 Update qt5.git 
Change-Id: Ie922b8e2989215de4efd3596e6532b201a3e7d0c
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
 2019-11-25 16:40:40 +00:00
Qt Submodule Update Bot
a72db33bfc Update submodules on 'wip/cmake' in qt/qt5 
Change-Id: Ia7d77b5f456e4e6196cacc179952e104476d968f
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-11-16 21:42:42 +00:00
Alexandru Croitor
eabc1ed5bd Add a few more ported repos to qt5.git wip/cmake 
Change-Id: I9f7215d3df0ba07af337262dd5e43bfc79e0a97a
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2019-11-15 13:02:52 +00:00
Qt Submodule Update Bot
3903c2a72d Update submodules on 'wip/cmake' in qt/qt5 
Change-Id: I28901d350b1f16b9a6b3d9776ee8055ea3356ade
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
 2019-11-14 14:55:50 +00:00
Qt Submodule Update Bot
df8310ced1 Update submodules on 'wip/cmake' in qt/qt5 
Change-Id: I26274b1707fd4d12a4da5503b9a414414f29148b
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-11-13 21:25:12 +00:00
Simon Hausmann
1aa25c1084 Bump vcpkg to a new snapshot 
Some patches were upstreamed and this beings the version in line with
what we need for Android. This patch also centralizes the version into a
shared file, for future use.

Change-Id: I90973f9bfcbc1bfeb2d11e2ee7a7fa4e4f6a58a2
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-11-13 09:57:53 +00:00
Leander Beernaert
8eab11f696 Update CMake to version 3.15.5 
Update required as there's a bug with setting the CXX_STANDARD on
android. Updating to this version fixes the issue.

Change-Id: I50b0bc2941e0919232b46bbf5b28133149878649
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-11-12 13:27:23 +00:00
Simon Hausmann
c85543f88d Merge remote-tracking branch 'origin/dev' into wip/cmake 
Conflicts:
	coin/platform_configs/default.yaml
	coin/platform_configs/qt5.yaml
	coin/platform_configs/qtbase.yaml
	coin/platform_configs/qtdeclarative.yaml
	coin/platform_configs/qtsaferenderer.yaml
	coin/platform_configs/qtsdk.yaml
	coin/provisioning/common/linux/cmake_linux.sh
	coin/provisioning/common/windows/cmake.ps1

Change-Id: I37bb513e3be19e4de4003679f8528677e57c09ee
 2019-11-11 10:52:16 +01:00
Liang Qi
ae27f21d26 Merge remote-tracking branch 'origin/5.15' into dev 
Conflicts:
	coin/platform_configs/default.yaml

Change-Id: Id4af2d72bb409b6851758a726677c2f2235fc0af
 2019-11-08 09:10:04 +01:00
Qt Submodule Update Bot
4e5a86d2bb Update submodules on 'wip/cmake' in qt/qt5 
Change-Id: I140d2692932cc10d4bedd45e149c804ec7329885
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-11-07 08:08:51 +00:00
Liang Qi
b3f160bc39 Merge remote-tracking branch 'origin/5.14' into 5.15 
Change-Id: I61d236e3d97ffd6e1cea460fba3d0eb2dac1d045
 2019-11-07 08:08:49 +01:00
Qt Submodule Update Bot
ebc02c3265 Update submodules on '5.15' in qt/qt5 
Change-Id: Id30b6ed350ca34593be6649e3671c6d57d99c8d1
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-11-07 07:31:11 +01:00
Liang Qi
68189ab965 Merge remote-tracking branch 'origin/5.13' into 5.14 
Conflicts:
	coin/provisioning/qtci-macos-10.12-x86_64/05-systemsetup.sh

Change-Id: Ie9eae2144868cbe4a6c5ff9472c1a0e8fd53ed08
 2019-11-06 14:19:45 +01:00
Qt Submodule Update Bot
98cb5fa965 Update submodules on '5.14' in qt/qt5 
Change-Id: I2d08d87f917232a79ebd9d7691610d61b82727b2
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-11-06 13:35:27 +01:00
Qt Submodule Update Bot
d148d7b0f7 Update submodules on '5.15' in qt/qt5 
Change-Id: I13014018eac8b9bb5fd769e82e987030fc08ad6a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-11-06 07:12:09 +01:00
Tony Sarajärvi
b34681bf02 Remove macOS 10.12 from CI 
Task-number: QTQAINFRA-3342
Change-Id: If617a762b4d65983d2d823ef035d4e5f9e5bc432
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
 2019-11-05 13:56:46 +00:00
Qt Submodule Update Bot
d939b369d2 Update submodules on 'wip/cmake' in qt/qt5 
Change-Id: I41c2406329c56d6c82a3d7c27b364adae366b79f
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-11-05 06:09:25 +00:00
Qt Submodule Update Bot
8287111e7b Update submodules on '5.15' in qt/qt5 
Change-Id: I2f00c0e3534f76108e7de3f072cf3ff9bb301a54
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-11-05 06:28:59 +01:00
Matti Paaso
f178318d2f Add new target for installer framework 
Task-number: QTQAINFRA-3284
Change-Id: I3945160f212921b2b30cd39982a808cfc164a1b1
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
 2019-11-04 14:46:22 +02:00
Qt Submodule Update Bot
d690f84fd4 Update submodules on '5.13' in qt/qt5 
Change-Id: Ibe25a3e99d09aea840c9e86a403dc1577701eb0a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-11-04 08:42:38 +01:00
Qt Submodule Update Bot
db4e91ce90 Update submodules on '5.15' in qt/qt5 
Change-Id: I0afddd8ede21a9693d9630f8d4ac848dc4d8b091
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-11-03 10:39:08 +01:00
Heikki Halmet
39a42f0abd Provisioning: Hide password with /dev/null 
Change-Id: Ic60ba668764c928977c826e02686a0cd341b995f
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
 2019-11-02 19:41:50 +03:00
Heikki Halmet
8bdabd9901 Provisioning: Remove Red Hat 6.6 from provisioning 
Task-number: QTQAINFRA-3260
Change-Id: If6078a36e9ab7730cacb81a9c417c87455db89cd
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Dimitrios Apostolou <jimis@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
 2019-11-02 19:41:41 +03:00
Heikki Halmet
52fe759eba Provisioning: Upgrade OpenSSL version to 1.1.1d 
Plus removing unused file install_openssl_111a.sh

Task-number: QTQAINFRA-3224
Change-Id: If5f9ee12e118e0329eb27f8d3ca9829011874382
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
 2019-11-02 19:41:33 +03:00
Heikki Halmet
5b752460bc Provisioning: Update Xcode package for macOS 10.14 
Apple's certification was expired so Xcode 10.2.1 package needs to be
updated from the Apple's download server. Old one causing problems with
RTA tests.

Task-number: QTQAINFRA-3317
Change-Id: I5006f95ab420e26523d2621800d80322a52bb9a2
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
 2019-11-02 18:41:24 +02:00
Qt Submodule Update Bot
7c563fc662 Update submodules on 'wip/cmake' in qt/qt5 
Change-Id: Ie50bc298a4743b348ad91d9f4efee97482ec55a4
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-11-02 07:16:06 +00:00
Tony Sarajärvi
2eab420e80 Remove more of update notifiers 
Change-Id: I507f584ef82b5f41f6b1cbc22fdd4ff6eff5e911
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
 2019-11-01 08:14:27 +00:00
Tony Sarajärvi
5b77e74a5e Change local Ubuntu repo mirror in provisioning 
The old mirror host Qt company used to sync their local mirror
from, stopped syncing from Ubuntu in October 2018.
The mirror mechanism was changed so that in the future if
addresses change, we don't have to touch the provisioning scripts
as the address is more general. Also a duplicate entry was removed.

Task-number: QTQAINFRA-3279
Change-Id: I65ada052d308eaef0411eb9caad893304eb05ab6
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
 2019-11-01 08:14:27 +00:00
Qt Submodule Update Bot
a25f221e07 Update submodules on 'wip/cmake' in qt/qt5 
Change-Id: Ifd37d952b51fe8c37d4ff2b99efec21c87d52f8c
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-11-01 05:52:22 +00:00
Liang Qi
3fb1ba5db8 Update submodules on '5.14' in qt/qt5 
Change-Id: I6c26e0dadf6aafd228abb860a431f96629811e38
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-10-31 12:15:00 +01:00
Qt Submodule Update Bot
83ae62a099 Update submodules on 'wip/cmake' in qt/qt5 
Change-Id: I84f7dfd1bcbfe889c5f3e4861297f661d50aa393
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-10-31 06:21:28 +00:00
Qt Submodule Update Bot
eaa76d4db8 Update submodules on 'wip/cmake' in qt/qt5 
Change-Id: I51d0e6deeb53b1eabe2796dc958ebf9cf536e8f7
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-10-30 05:05:44 +00:00
Jani Heikkinen
464c4c8147 Drop unnecessary android builds 
From 5.14 -> we will have combined android builds for all android
targets. So remove all separate android builds as those are covered by
multi ones.

Task-number: QTQAINFRA-3310
Change-Id: Ia00222cf56e85ed207ad01d5d00a81849196176d
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
 2019-10-29 19:46:26 +00:00
Heikki Halmet
eb0ef419ec Add allowUntrusted parameter for command line tools and refresh Xcode 
Apple has signed their packages with certificate which has been
expired 24.11.2019. Packages are unusable without allowUntrusted
parameter

Also Xcode package for macOS10.13 needs to be refetched from
Apple's download to local cache

Task-number: QTQAINFRA-3317
Change-Id: Iebbe81ee0c360e5f0b49d422b38fe1a148424891
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
 2019-10-29 19:37:09 +02:00
Simon Hausmann
0fb525f9ef Add x11extras to the qt5 build 
Change-Id: Iac7273717b7dff510c79cd6151349e6ddb6a5e56
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Qt CMake Build Bot
 2019-10-29 12:12:54 +00:00
Qt Submodule Update Bot
010595af45 Update submodules on 'wip/cmake' in qt/qt5 
Change-Id: I23f2cf4a7577df02e3e7b8590aede4d755117cb1
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-10-29 11:39:35 +00:00
Qt Submodule Update Bot
12a647fbe5 Update submodules on 'wip/cmake' in qt/qt5 
Change-Id: Ib2187b662c55268f101640b32c98cf9cd325a66e
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Qt CMake Build Bot
 2019-10-28 05:57:10 +00:00
Tony Sarajärvi
d406ff6398 Build examples on the no-widgets builds 
Task-number: QTQAINFRA-1975
Task-number: QTBUG-63908
Change-Id: I0279fd4ca58ab389855e1152e9a8cee3ac97d502
Reviewed-by: Rolf Eike Beer <eb@emlix.com>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
 2019-10-26 14:11:07 +00:00
Tony Sarajärvi
17550319e5 Provision gnuwin32's path 
By provisioning the path to gnuwin32, we can remove the
hard coded paths from Coin.

Task-number: QTBUG-73422
Change-Id: Ice96fcd992e22ed39b66496403b9eaa99a6865a0
Reviewed-by: Toni Saario <toni.saario@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
 2019-10-26 14:10:50 +00:00
Qt Submodule Update Bot
2a5f8edda6 Update submodules on 'dev' in qt/qt5 
Change-Id: I31c4601a3e46eb8f1a6cef89547796a2d8ddb4e1
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2019-10-26 14:01:00 +02:00
Qt Submodule Update Bot
d7f90cf379 Update submodules on 'dev' in qt/qt5 
Change-Id: Ia5db1b78b32450b1990c6e7a6e9b6991923f6a08
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2019-10-25 21:01:05 +02:00
Qt Submodule Update Bot
3693303aa5 Update submodules on 'wip/cmake' in qt/qt5 
Change-Id: Iad5169b8d1b2a00105df7a4ac2fc0fb6e3537832
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2019-10-25 05:25:28 +00:00
Simon Hausmann
bf87526ff0 Add QtConnectivity 
Now that the cmake port landed

Change-Id: I5218a23fffd8de736ffcf5e039d369aec0827f42
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Qt CMake Build Bot
 2019-10-24 15:49:17 +00:00
Qt Submodule Update Bot
edf6851875 Update submodules on 'wip/cmake' in qt/qt5 
Change-Id: Ice21b858ec75f6319bee745c47790293e0f3d4d1
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2019-10-24 15:10:34 +00:00
Qt Submodule Update Bot
a331d9e655 Update submodules on 'wip/cmake' in qt/qt5 
Change-Id: I083e08e3c24c1d29d7fedc69490187765a651b12
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2019-10-23 12:41:46 +00:00
Qt Submodule Update Bot
d5f83783f6 Update submodules on '5.14' in qt/qt5 
Change-Id: Ieb58c167d34716afddfb3ecc83d1333b8dbc0bbb
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-10-22 06:59:11 +02:00
Qt Submodule Update Bot
595a45dd1d Update submodules on '5.14' in qt/qt5 
Change-Id: I666a0eefd0216eace1e1cfa302e48a5dec7cd4f5
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
v5.14.0-beta2 		2019-10-20 22:30:58 +02:00
Heikki Halmet
60befd7508 Provisioning: Disable automatic cleanup from windows 
Task-number: QTQAINFRA-3238
Change-Id: Ie64086b650016adb7129bd4c4592ca987cc1453b
Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>
Reviewed-by: Dimitrios Apostolou <jimis@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
 2019-10-18 13:53:05 +03:00
Simon Hausmann
33d9eb2b99 Work around cmake issue breaking C++ feature detection on Android 
As per https://gitlab.kitware.com/cmake/cmake/issues/19515, the version
of CMake we're currently using in the CI has an issue detecting clang as
GNU compatible C++ frontend and thus fails to convert the values in the
CMAKE_C/CXX_STANDARD variables to compiler flags correctly. Work around
this for now as suggested in the upstream ticket. We can remove this
when upgrading to a newer cmake version.

Change-Id: I0ea37503c086ff86e05c50b812474522a7737b20
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
 2019-10-17 15:15:09 +00:00
Samuli Piippo
2b58935efd QNX: Use extprefix for the host path 
Use extprefix instead of prefix, so that the target deployment
path won't contain host paths. Especially needed to avoid Windows
host paths on target. Prefix will default to /usr/local/Qt-x.x.x

Task-number: COIN-48
Change-Id: Ie888dace694294b72a32913b65a191b4bcb78371
Reviewed-by: James McDonnell <jmcdonnell@blackberry.com>
 2019-10-16 10:02:09 +03:00