lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-02-01 19:36:04 +08:00
Code Issues Packages Projects Releases Wiki Activity
3,237 Commits 118 Branches 270 Tags
57ea35cacea9be78550ce0351357282cd900e56a
Commit Graph

3237 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Brüning
57ea35cace Un-ignore qtwebengine in dev 
Change-Id: I72da39c8bfba31fc366b2757f759a4aba070e960
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
 2019-07-12 21:48:32 +02:00
Sona Kurazyan
e4b596fcfe Add the docker images for CoAP test servers 
This change includes:
- Docker image for the test server to test non-secure and PSK-based
  CoAP security modes.
- Docker image for the test server to test X.509 certificate-based
  CoAP security mode.

Change-Id: Ice661917591ecaee8ebc3500209bcffc08981f65
Reviewed-by: Ryan Chu <ryan.chu@qt.io>
 2019-07-07 11:36:16 +02:00
Ryan Chu
d49ae7020c Revert "Revert "Provisioning: disable docker test servers on Windows 10 (x86_64)"" 
This reverts commit 84ff024609.

Reason for revert: <Some VM crashed again when running docker tests>

Change-Id: Iad753c1c4728c6eddc53816e2c51947ce724bf6b
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
 2019-07-05 08:43:14 +00:00
Qt Submodule Update Bot
ff74cdbe96 Update submodules on 'dev' in qt5 
Change-Id: I2bbb20be92c15de518f3c361cffbe2a2f0150c4c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-07-04 06:02:29 +02:00
Qt Submodule Update Bot
c6669046b4 Update submodules on 'dev' in qt5 
Change-Id: Ib8778d70ad087c95d92998ae533c6e3fb2412d6a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-07-03 08:58:28 +02:00
Qt Submodule Update Bot
3ce3dae19b Update submodules on 'dev' in qt5 
Change-Id: If2c839bcc7d8fd40f832854d0e729bd811187d85
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-07-01 09:17:20 +02:00
Qt Submodule Update Bot
7eb00bc2c8 Update submodules on 'dev' in qt5 
Change-Id: I48275cb9607bc5f7f7f4d50c5c17f2bf537b9538
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-06-30 03:15:07 +02:00
Qt Submodule Update Bot
1d5641087a Update submodules on 'dev' in qt5 
Change-Id: I780c4c7d8894a4933aa908b2a90f2d1d7d069677
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-06-29 09:19:40 +02:00
Qt Submodule Update Bot
3473922cb4 Update submodules on 'dev' in qt5 
Change-Id: I2ede3578fe5d37a8df920fb9736994d25e7da47c
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-06-28 04:27:58 +02:00
Liang Qi
03969bfe23 Update submodules on 'dev' in qt5 
Change-Id: Ie0b1c3abcaea4a74279a7001cadecac70c1f853b
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-06-27 14:46:39 +02:00
Liang Qi
19894d279f Update submodules on 'dev' in qt5 
Skip qttools in this round.

Temporarily ignore qtwebengine due to QTBUG-76549.

Change-Id: I93afa1bedb18392a3f6c7ae676690b87f07aeaf9
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-06-24 09:31:56 +02:00
Thomas Hartmann
a0b69977c6 Add qtquicktimeline as a submodule in qt5.git#dev 
Task-number: QDS-54
Change-Id: Ic92eb39b8bd9fced3b4a701f4d40364a2d8f9e95
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
 2019-06-18 11:20:22 +02:00
Liang Qi
d869c671b5 Update submodules on 'dev' in qt5 
Skip qtbase in this round.

Change-Id: Idd621fa568f01f4e4481da61a4e2fb8fe1bdcaba
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-06-18 10:06:49 +02:00
Ryan Chu
84ff024609 Revert "Provisioning: disable docker test servers on Windows 10 (x86_64)" 
This reverts commit 577d01e9df.

Reason for revert: force vmx instructions to Coin level B virtual machine

Change-Id: I54a97fb6dc96315768c8047d487f1ed354ab4aac
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
 2019-05-31 07:30:23 +00:00
Liang Qi
dae67b28ab Update submodules on 'dev' in qt5 
Skip qtbase in this round.

Change-Id: Id1f988ef49bc35a1d230480af14fc90d4efa86b8
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-05-28 22:15:01 +02:00
Liang Qi
5d3976765c Update submodules on 'dev' in qt5 
Skip qtbase in this round.

Change-Id: Icc5ee34380c08b8365128c4f2e18240c6d50a90c
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-05-26 20:49:48 +02:00
Liang Qi
47225925c5 Update submodules on 'dev' in qt5 
Skip qtbase in this round.

Change-Id: I3434ffc21f21f953f0538e86e0d554ae5e82b331
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-05-22 14:01:42 +02:00
Allan Sandfeld Jensen
edc39be08b Fix qtdeclarative boot2qt CI config 
DISTRO_OPTS was missing quotes.

The same thing is also done in 3e6a04c09d.

Change-Id: Ibb237b791fedea4edde2ca0ef152553502462129
Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>
(cherry picked from commit 04fa1bf4ef)
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
 2019-05-16 10:42:41 +00:00
Liang Qi
2e028e620d Bring qt3d back 
Task-number: QTBUG-75384
Change-Id: Ia7cf50e3567bf01cce9dcc167253d76cdd963d4d
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-05-13 14:20:06 +00:00
Qt Submodule Update Bot
e6c0dc1d60 Update submodules on 'dev' in qt5 
Change-Id: I370770bdc8179075f4e5e01e54a29591fd7caa16
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-05-13 05:30:49 +00:00
Liang Qi
faf54c4cec Merge remote-tracking branch 'origin/5.13' into dev 
Change-Id: I3eb42ce8a43418919c9bb8d0ac4d3714aea94fac
 2019-05-12 20:36:18 +02:00
Qt Submodule Update Bot
7d1d1aa2d2 Update submodules on '5.13' in qt5 
Change-Id: I0e6e46b247198ce68668222e555e3ebf256729bc
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-05-12 15:51:20 +00:00
Liang Qi
6fbaba5d52 Merge remote-tracking branch 'origin/5.13.0' into 5.13 
Change-Id: Ib80ac156ec8ce5690d5ec784c671bd706afe0b4e
 2019-05-12 11:12:36 +02:00
Aapo Keskimolo
9c49284978 Remove redundant windows configuration 
The windows configuration was added by commit

 8cdf60fe64

which was unintended and caused breakages due to wrong library paths.

Regression was introduced by 65d4cea3ac12a5d585da7ee1ba2933a3c23051b8 which
allowed sharing storage paths with builds with different configure arguments.

Change-Id: I18d12c4ff86a5bb28484c7b39ca38ff4f6f590d8
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
 2019-05-12 07:29:17 +00:00
Qt Submodule Update Bot
494d10fb73 Update submodules on '5.13' in qt5 
Change-Id: Ieb925882ea0c8b536bde7f9a1d63aecdf6213632
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-05-09 20:44:40 +00:00
Liang Qi
192372bb56 Update submodules on 'dev' in qt5 
Change-Id: I085f25a148ddc404f399e79924968acfd6b7de07
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-05-09 19:50:49 +00:00
Liang Qi
f557e0634f Merge remote-tracking branch 'origin/5.13' into dev 
Change-Id: Ie76cb93e16a98f3b2aae0e6785ccca539e5c5f2e
 2019-05-09 15:27:08 +02:00
Liang Qi
a66a54035c Update submodules on 'dev' in qt5 
Temporarily ignore qt3d until it got fixed correctly.

Task-number: QTBUG-75384
Change-Id: Ib9aec0681b9ca1660f47216e0057600ba4736ce8
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-05-09 12:57:41 +00:00
Liang Qi
0a1e27b33e Merge remote-tracking branch 'origin/5.13.0' into 5.13 
Change-Id: Ibab4a9d55ce371259f52edb1819a397c1f2d7d9e
 2019-05-09 12:04:02 +02:00
Tony Sarajärvi
8cdf60fe64 Split features list between Coin and qt 
Start using configure args as configure string instead of flags.

Task-number: QTQAINFRA-2744
Change-Id: I2ce189531df7ba805d18b36615259bf0303e7175
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
 2019-05-08 09:18:56 +00:00
Qt Submodule Update Bot
819362c5d6 Update submodules on '5.13.0' in qt5 
Change-Id: I6e14f7f3fedc1ce69e3cedaf8a5b2251d12fae45
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-05-08 06:47:41 +00:00
Liang Qi
8f63da629a Merge remote-tracking branch 'origin/5.13' into 5.13.0 
Change-Id: If2321aae395ea99c0fb4cf4ef7b3c5a580d3357e
 2019-05-07 14:58:36 +02:00
Tony Sarajärvi
049eb21a1d Replace RHEL 7.4 with 7.6 in the CI 
Task-number: QTQAINFRA-2942
Change-Id: I4186a2961ce81eed7a7fd8994c4a10f35b8fad1c
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
 2019-05-07 07:15:58 +00:00
Qt Submodule Update Bot
c6b018a925 Update submodules on '5.13' in qt5 
Change-Id: Ib948b49eccead6649f228a3d7acc83a2f6522660
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-05-06 06:56:28 +00:00
Liang Qi
aeea2c8425 Merge remote-tracking branch 'origin/5.12' into 5.13 
Change-Id: Ia93633ae4ef9677ede751467a70e8f91799829a2
 2019-05-04 11:04:32 +02:00
Qt Submodule Update Bot
4c4595b93b Update submodules on '5.13.0' in qt5 
Change-Id: I637151d097b4f311f86004c2eb26f8a1d8b80ef0
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-05-03 09:15:06 +00:00
Qt Submodule Update Bot
c2506b0f9c Update submodules on '5.13' in qt5 
Change-Id: I99a2129b1f73fc1dd801b406b9741cdfea37429e
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
 2019-05-03 07:32:05 +00:00
Juha Karjalainen
6465c42122 Provisioning: install msys2 
Windows need msys2 perl for configuring openssl 1.1.1 for android.

Task-number: QTQAINFRA-2327
Change-Id: I217542b6e9b3fd0f656b8186e2cde4283257dcf8
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
 2019-05-03 07:30:44 +00:00
Qt Submodule Update Bot
ea052ceb0a Update submodules on '5.13' in qt5 
Change-Id: I4f9b2ff00e79cf16a9effd6bdffa679a7f25b50b
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-05-02 09:04:01 +00:00
Qt Submodule Update Bot
d27f9e9b88 Update submodules on '5.12' in qt5 
Change-Id: If055179b9dfbc4af842c4972cabb79c2966d57d8
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
 2019-04-30 18:44:54 +00:00
Kari Oikarinen
b692cf823a Adjust submodule branches 
Change-Id: I8efc4803c92a42e67add0646be00c0d6571fb9e2
 2019-04-29 11:48:19 +03:00
Liang Qi
22bb88ed07 Update submodules on '5.12' in qt5 
Change-Id: I69ecf3e1a1f7b5dbdc6e86478475f9563854dac6
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-04-26 05:46:36 +00:00
Liang Qi
ffe0c11420 Merge "Merge remote-tracking branch 'origin/5.12.3' into 5.12" into refs/staging/5.12 2019-04-26 05:46:30 +00:00
Liang Qi
6dd08088fc Merge remote-tracking branch 'origin/5.12.3' into 5.12 
Change-Id: Ib5cb484726a93f7b317e1dd8e74b446e6673cdbd
 2019-04-25 16:05:59 +02:00
Simo Fält
09f28e9e1d Provisioning: Install python36-devel to rhel 7.4 
The rhel Python3 system package is missing development libs.

Fixes: PYSIDE-996
Change-Id: I3863c85ad04021dd0f0d4af4bae5917a6785a7e1
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
 2019-04-25 12:58:28 +00:00
Heikki Halmet
65cf2cb957 Provisioning: Install Vulkan to Rhel 7.4 
Enables Vulkan support at compile time

Task-number: QTBUG-72763
Change-Id: If97adb030d50a147c9714afe3ef360291904b58a
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
 2019-04-25 09:29:05 +00:00
Qt Submodule Update Bot
766fc425e3 Update submodules on '5.12' in qt5 
Change-Id: I2c02e38847615cace282fa261ac5ac526eb6ece2
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-04-24 16:37:45 +00:00
Heikki Halmet
dbaa42baa7 Provisioning: Use ANDROID_NDK_ROOT instead of ANDROID_NDK_HOME 
Without this binaries will be hardcoded to look in e.g
/opt/android/android-ndk-r19b which means that RTA tests will fail

Task-number: QTBUG-74952
Change-Id: Ic2b1297e15d905f2250333b6bc884abe2f1472d4
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
 2019-04-23 06:04:34 +00:00
Qt Submodule Update Bot
12cde4e0da Update submodules on '5.12' in qt5 
Change-Id: I2fa664d7b94bf511d4321e0698aba679ccb38ad0
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-04-23 04:06:25 +00:00
Heikki Halmet
e72a082da5 Provisioning: Remove MSVC 2015 update 3 patch from provisioning 
MSVC 2015 update 3 patch seems to be already pre-provisioned with
MSVC 2015 update installation

Task-number: QTQAINFRA-2899
Change-Id: I582c47e4b54303394805f205c4becf6a74e941ec
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit b3e35cbac5)
Reviewed-by: Juha Karjalainen <juha.karjalainen@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
 2019-04-18 10:01:57 +00:00