lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-03-17 09:46:08 +08:00
Code Issues Packages Projects Releases Wiki Activity
3,326 Commits 120 Branches 272 Tags
18ddaecc22104fdb1d8fbe8a554537c996ec0806
Commit Graph

3326 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Heikki Halmet
84aaa89cf4 Provisioning: Fix path for fbx files 
Currently Qt3d Studio build don't recognize fbx path because of space
in folder name. This change will fix it by taken use the packages which
don't have space in the folder name.

Task-number: QT3DS-2440
Change-Id: I502bb04489a03a5a81e164f8a86f3200f4ec3910
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
 2018-11-13 05:51:53 +00:00
Liang Qi
72b60b23f3 Update submodules on '5.12' in qt5 
Skip qtdeclarative in this round due to QTBUG-71705.

Change-Id: Ic62440612e135c1cb8c5e740f4c13de7d37565bf
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2018-11-12 17:12:05 +00:00
Eike Ziller
7156b83710 Provisioning: Install perl on Windows 10 32-bit 
Needed for Qt Creator build.

Change-Id: I5674f159de456a925e7a695546a53537f2517376
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
 2018-11-12 08:21:46 +00:00
Heikki Halmet
c89d9ed357 Provisioning: Add Rhel 6.6 for QtCreator 
QtCreator need's to have provisioned Rhel 6.6 available.
(Partially) Reverts 54261be7c3

Task-number: QTQAINFRA-2270
Change-Id: Ie73c09181e0586dd0f4e9977208c9188037843d9
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2018-11-12 08:21:43 +00:00
Qt Submodule Update Bot
161c7e79ac Update submodules on '5.11' in qt5 
Change-Id: I468056d9f0f591e259125814b2ecaed2f323135b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2018-11-12 04:30:56 +00:00
Qt Submodule Update Bot
caf4c58941 Update submodules on '5.11.3' in qt5 
Change-Id: If25a7c3df9d53ff3bd84b75a1dd775e5ab9cd35f
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2018-11-11 20:42:04 +00:00
Qt Submodule Update Bot
d649cc3740 Update submodules on '5.11' in qt5 
Change-Id: I64984b9043e20918c6876bc5941b66dcdee257a4
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2018-11-11 19:04:28 +00:00
Qt Submodule Update Bot
6c624aa570 Update submodules on '5.12.0' in qt5 
Change-Id: I8c971bdcbbca07a8ec03cc4a3dda56ada4afcd00
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
 2018-11-11 18:59:51 +00:00
Qt Submodule Update Bot
c17352fc12 Update submodules on '5.11.3' in qt5 
Change-Id: Ibf09137346dd0aef4f3dc0a784ad9f4c450f068a
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2018-11-09 21:47:12 +00:00
Qt Submodule Update Bot
829447d340 Update submodules on '5.12.0' in qt5 
Change-Id: If218ebc667e5378b1a2527f42c93c456045f1f45
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
 2018-11-09 13:10:15 +00:00
Heikki Halmet
4d15cea11a Provisioning: Update Java to 1.8.0 version in Rhel 6.6 
Currently Rhel 6.6 have too old Java version for Jenkins. This need to
be updated so that machine can connect with Jenkins.

Task-number: QTQAINFRA-2377
Change-Id: I653df6f1f060bdc12164cc407fcc4cd873d2b24f
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2018-11-08 13:52:01 +00:00
Matti Paaso
f335f71d02 Add new targets for packaging Jenkins 
Change-Id: If2a769ef74ef01f663cc7673477346009d593e38
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
 2018-11-08 13:51:34 +00:00
Qt Submodule Update Bot
3debc56a2d Update submodules on '5.11' in qt5 
Change-Id: If42e9fef6d7d56d6bff98fbf79d06b3b99176221
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2018-11-08 04:31:03 +00:00
Heikki Halmet
1248a6787d Provisioning: Add scp and ssh location in the PATH for Windows 
RTA needs to have these on the PATH

Change-Id: I59694737e9284bc31eefcc4ff89219665c2aa430
Reviewed-by: Matti Paaso <matti.paaso@qt.io>
 2018-11-07 20:07:36 +00:00
Liang Qi
1bd6aab208 Update submodules on '5.12' in qt5 
Skip qtbase in this round due to QTBUG-71550.

Change-Id: I8cd54eab0c1d6c7a95f6b97aac467dce9a9325da
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2018-11-07 20:07:27 +00:00
Qt Submodule Update Bot
471fa009d9 Update submodules on '5.11' in qt5 
Change-Id: Ibcc62dda910fb662ff85c840ca00cc31f17a8f00
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2018-11-07 11:56:35 +00:00
Heikki Halmet
7974f26b20 Provisioning: Disable notifications and remove apport 
These can cause flakiness during tests

Task-number: QTQAINFRA-2307
Change-Id: Ib8b850e3e1fabe3070bbd27785d043984e085cb7
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
 2018-11-07 07:23:49 +00:00
Qt Submodule Update Bot
092b611d80 Update submodules on '5.12.0' in qt5 
Change-Id: Ie4dca9cdf3a39a21cd8c380204860ee578733463
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2018-11-07 05:00:29 +00:00
Heikki Halmet
abe69c34bb Provisioning: Install chrpath for Jenkins 
Task-number: QTQAINFRA-2270
Change-Id: I5afd9c6682ff6acb040ee069f3d7a179260f71d3
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2018-11-06 17:34:02 +00:00
Liang Qi
599370a6c4 Update submodules on '5.12' in qt5 
Skip qtbase in this round due to QTBUG-71550.

Change-Id: I3eaa76e386a4d6a6b981a11a2eadd290059cb830
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2018-11-06 17:33:53 +00:00
Qt Submodule Update Bot
6d6e000932 Update submodules on '5.12.0' in qt5 
Change-Id: I41d60616e029d96bb6580345a59ff906ded608d5
Reviewed-by: Liang Qi <liang.qi@qt.io>
v5.12.0-beta4 		2018-11-06 10:25:52 +00:00
Michal Klocek
417d293fa7 Add 'qttools' dependency for WebEngine 
QtTools module is required for designer plugin.

Fixes: QTBUG-71404
Change-Id: I081740679dace196b9ff42d98bddd941848738f8
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
 2018-11-05 18:13:19 +00:00
Qt Submodule Update Bot
e4707bcdff Update submodules on '5.12.0' in qt5 
Change-Id: Ic6ce42f23f2e567e79d69180b986ae25e97ea1c7
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2018-11-05 18:13:02 +00:00
Liang Qi
9a9f358508 Graduate qtremoteobjects and qtwebglplugin 
Change-Id: I07a55764a4a6900d233d4bcfa20344009a9add26
Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
 2018-11-02 14:56:28 +00:00
Oswald Buddenhagen
3bb63c22c4 Adjust submodule branches 
Change-Id: Iae1035a9633243bc39e86a6e9133a1263b40a750
 2018-11-02 15:29:23 +01:00
Liang Qi
c1376f91df Update submodules on '5.12.0' in qt5 
Change-Id: I2dc837b9d8e75176c5ecd3c42e17892676c1f65d
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2018-11-02 11:21:46 +00:00
Joni Jäntti
7e67d0e558 Provisioning: RHEL-6.6: Update curl 
The currently used version of curl does not support TLS 1.2 or newer.
Since download.qt.io has minimum requirement of TLS 1.2 we need to
update the these packages.

Task-number: QTQAINFRA-2212
Change-Id: I4737443b5b2180a592a18d9095fe3f31063ba329
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
 2018-11-02 07:59:24 +00:00
Tony Sarajärvi
b082d7d544 Replace .ci.local addresses with .intra.qt.io in provisioning scripts 
Change-Id: I5e5bc084faabb28ffdf0437871445ecb8970bfb3
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2018-11-01 07:16:57 +00:00
Qt Submodule Update Bot
195799f36c Update submodules on '5.11' in qt5 
Change-Id: Id39d804153ed5bd04545fdd5fd90ec3cb7de88cf
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2018-11-01 07:16:52 +00:00
Joni Jantti
37eeb598cc Provisioning: PyPFD2 
Required for reading PDF doc files in RTA tests.

Task-number: QTQAINFRA-2103
Change-Id: I4da98460fb5d5ad26f9e1e16c503a0d94be047a6
Reviewed-by: Johanna Äijälä <johanna.aijala@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit bb6a91d5d4)
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
 2018-10-31 19:39:10 +00:00
Liang Qi
d3299a3d27 Merge remote-tracking branch 'origin/5.12' into 5.12.0 
Change-Id: I41f6780d67aeb9e065d86f53feee71d38c00428f
 2018-10-30 12:22:55 +01:00
Antti Kokko
01faa84629 Update qt3d-runtime.txt targets 
Add missing macOS and Windows Android arm64 targets.
Remove iOS target that is now included in default.txt.

Change-Id: Ifc20336b94477b2f8be456ef7f7f8bfaf8bf1190
Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
 2018-10-30 09:56:38 +00:00
Qt Submodule Update Bot
82ca14ffd0 Update submodules on '5.12' in qt5 
Change-Id: I33be3020b077a33f128f18bc920aa89746ba5590
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2018-10-29 17:29:18 +00:00
Oswald Buddenhagen
1af3c19fc8 commit template: add missing trailing space to Fixes footer 
Change-Id: If966752eeebc7044a9a8ba5a2a66b8c03846c771
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2018-10-29 15:29:44 +00:00
Qt Submodule Update Bot
7ea65aec65 Update submodules on '5.11' in qt5 
Change-Id: I2fd329c2d1097b89ab86768927b605af4c6e2a0f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2018-10-26 10:28:13 +00:00
Juha Karjalainen
3b4ca5d6c0 Provisioning: Update openssl to version 1.0.2p 
Task-number: QTQAINFRA-2266
Change-Id: I3f09d9169f17bcd83dcfd72547440bca487fd9db
Reviewed-by: Simo Fält <simo.falt@qt.io>
 2018-10-26 07:23:14 +00:00
Qt Submodule Update Bot
99f8704350 Update submodules on '5.12' in qt5 
Change-Id: I38d842c7d9df454cd653ca48574023b25512c62c
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2018-10-26 07:22:38 +00:00
Qt Submodule Update Bot
70162c557c Update submodules on '5.12' in qt5 
Change-Id: Iba893056096d70731449005033a5e3e13d6650c7
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2018-10-25 16:11:03 +00:00
Simo Fält
d65d71731f CI platform config: Make 32 bit msvc2017 config as default 
Swapping 32 bit windows packaging configs so that MSVC 2017 is
built as default config and MSVC 2015 only for qt5.

As the config is not part of the default.txt we have to add it as
module specific config.

Change-Id: I3c423c2c80d0093fdeca340d6faa8e162c03b5cd
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
 2018-10-25 12:35:07 +00:00
Qt Submodule Update Bot
26cece9f93 Update submodules on '5.11' in qt5 
Change-Id: I71eaf20c20124a8634e715aaee11bc0118a84a23
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2018-10-24 13:26:46 +00:00
Qt Submodule Update Bot
41b0fbb462 Update submodules on '5.12' in qt5 
Change-Id: I86f12f4294fcda16d1aff7ee73681d9fef37403e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2018-10-24 11:39:38 +00:00
Qt Submodule Update Bot
96a07386fb Update submodules on '5.11' in qt5 
Change-Id: I7cd87f5de55b09332b9bfcfd5d4532cbc09072fc
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2018-10-23 18:13:07 +00:00
Qt Submodule Update Bot
3f76170c93 Update submodules on '5.12' in qt5 
Change-Id: Ia2c18f2579af6a1c3e0277cf73a1a219e14b5295
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2018-10-23 18:12:59 +00:00
Oswald Buddenhagen
ff2c96f483 Adjust submodule branches 
Change-Id: I43f7c5c76e0cd646e506e7071e9e8c450bdc1b03
 2018-10-22 15:52:09 +02:00
Qt Submodule Update Bot
ab7b56afe6 Update submodules on '5.11' in qt5 
Change-Id: I2a43b09d5d15775ed17aaa782bb81741f1e15c1f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2018-10-22 00:20:14 +00:00
Qt Submodule Update Bot
7d01b06b8f Update submodules on '5.12' in qt5 
Change-Id: I8e2e7811ac09b65cb81b45c4aa48bf4e57885c71
Reviewed-by: Liang Qi <liang.qi@qt.io>
v5.12.0-beta3 		2018-10-22 00:19:52 +00:00
Qt Submodule Update Bot
b621cfd505 Update submodules on '5.12' in qt5 
Change-Id: Ie8e19006d5e007e732ca0f68d8128ac3dfc8f498
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2018-10-21 09:33:06 +00:00
Tony Sarajärvi
4667cfc432 Update Android NDK and SDK on macOS envs 
Task-number: QTQAINFRA-2244
Change-Id: I20994bc7a64edefda09da68c4beddde4dc9948aa
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2018-10-20 05:16:02 +00:00
Tony Sarajärvi
bc5e5baf55 Update Android NDK and SDK on Windows envs 
Task-number: QTBUG-47672
Change-Id: I3e6526b296f15927b90ab3310d91f8505b0228b3
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
 2018-10-20 05:15:55 +00:00
Tony Sarajärvi
97efaacb2b Update Android NDK and SDK on Linux envs 
Task-number: QTBUG-47672
Task-number: QTQAINFRA-2298
Done-with: Liang Qi <liang.qi@qt.io>
Change-Id: I42c87d8453423530173b826c09dc6eb4bf9ad5b8
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2018-10-20 05:15:40 +00:00