lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-01-09 08:26:34 +08:00
Code Issues Packages Projects Releases Wiki Activity
3,240 Commits 118 Branches 268 Tags
a268fb46895f694a58da2389fd47ca393a68deef
Commit Graph

3240 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Frederik Gladhorn
a268fb4689 Adjust submodule branches 
Change-Id: I65388af02c1ab3608abf7e18a89966020e213d10
 2019-07-29 14:26:43 +02:00
Friedemann Kleint
abfbc0668c Disable tests for MSVC2015/Win32/64bit 
Frequent crashes of tst_QDir have been again observed recently in the
dev branch with MSVC2015. It should be sufficient to test MSVC2017;
MSVC2015 should only be compile-tested.

Task-number: QTBUG-58654
Change-Id: I0eb5a1294432a24548468c993418bc18671547bb
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Dimitrios Apostolou <dimitrios.apostolou@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
 2019-07-29 09:35:08 +02:00
Qt Submodule Update Bot
ac2a57b1c3 Update submodules on '5.13' in qt5 
Change-Id: I0f92c902424fc5e58158921235b582ef7a7ddc91
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-07-28 22:31:07 +02:00
Qt Submodule Update Bot
71e9322862 Update submodules on '5.13' in qt5 
Change-Id: If1822246b0553ed5d550c766a8e3700fd7c14068
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-07-27 22:31:00 +02:00
Qt Submodule Update Bot
f470b8eabe Update submodules on '5.13' in qt5 
Change-Id: I0ba5aab5d93df54742604eca6a893cea11cf19c0
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-07-25 22:31:11 +02:00
Qt Submodule Update Bot
c31548830f Update submodules on '5.13' in qt5 
Change-Id: Ia71bd5cb97367e0a750e090bfbcacfc89ef41490
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-07-25 13:45:26 +02:00
Qt Submodule Update Bot
7001f15765 Update submodules on '5.13' in qt5 
Change-Id: Ib6e8c649e6e2f6a9c1fd60a459687426aec1a149
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-07-23 11:11:30 +02:00
Liang Qi
5a16472559 Update submodules on '5.13' in qt5 
Change-Id: I5a1af05df086b2ba86dc736714a2eae9db299248
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-07-23 09:43:03 +02:00
Liang Qi
bd7b28582f Merge "Merge remote-tracking branch 'origin/5.13.0' into 5.13" 2019-07-06 06:02:12 +02:00
Liang Qi
a319bc5f5f Merge remote-tracking branch 'origin/5.13.0' into 5.13 
Change-Id: I97c42bef6632a4aeccefab008e0f615f7a9e9f78
 2019-07-05 20:05:17 +02:00
Qt Submodule Update Bot
231a5b777c Update submodules on '5.13' in qt5 
Change-Id: I39a42574427b32d1d5c73ea96713913674ca7303
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-07-05 19:27:39 +02:00
Liang Qi
59891119e7 Update submodules on '5.13' in qt5 
Skip qtbase in this round.

Change-Id: I49b70268be1be3d29fca34af87d376dc51154aec
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-07-02 23:02:59 +02:00
Qt Submodule Update Bot
daf8327b2c Update submodules on '5.13' in qt5 
Change-Id: I40b83973a9cab06f068c8a61f51fded3eddebeef
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-06-25 20:16:42 +02:00
Konstantin Tokarev
3a940903c0 Make header line in qtwebkit.txt longer to prevent parsing error 
Change-Id: I0531f91af397d09cfa7eae96c0d779d3055b0456
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2019-06-25 10:47:00 +03:00
Qt Submodule Update Bot
1ba5e3b0b9 Update submodules on '5.13' in qt5 
Change-Id: I6f19903a3a7cdcf8fb2579b710ccda23427fb91b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-06-24 22:30:58 +02:00
Konstantin Tokarev
35c1c88749 Update platform_configs for QtWebKit 
* Remove redundant MSVC2017 configuration
* Synchronize Mingw73 configuration with qt5.txt

Change-Id: I02f6649b77e89b9acb3bdd516419aa12817caaa3
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2019-06-24 13:02:11 +03:00
Qt Submodule Update Bot
e7f8eeb30d Update submodules on '5.13' in qt5 
Change-Id: I567e22dba0fc0b4c3dd377aa3d37ba0985855ba1
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-06-22 22:30:55 +02:00
Qt Submodule Update Bot
6131434bdf Update submodules on '5.13' in qt5 
Change-Id: I62f02ca85e035aa26dc0f9a0ebb4d78e4abc2363
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-06-20 22:31:38 +02:00
Qt Submodule Update Bot
dedbec30d1 Update submodules on '5.13' in qt5 
Change-Id: Ia2ae5b47bc7e4aa094c6ed72d0a7be3bef090387
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-06-19 22:30:48 +02:00
Qt Submodule Update Bot
a04751c10e Update submodules on '5.13' in qt5 
Change-Id: I216600c90956b5716b1ce1a787b21417dbc4089a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-06-18 22:31:30 +02:00
Qt Submodule Update Bot
6f6b43593e Update submodules on '5.13' in qt5 
Change-Id: Ifb6609089d41976f649b73df26e9214ab3b49fd4
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-06-17 22:32:31 +02:00
Qt Submodule Update Bot
dcb1c8b41c Update submodules on '5.13' in qt5 
Change-Id: Id806418087800e313ee9a14c0a99fcf7215579c0
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-06-14 22:31:34 +02:00
Heikki Halmet
644f8b7006 Fix openssl 1.1 library configurations 
Change-Id: Idcb919e5f388b509e4215cf5515c8716490d5872
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>

(cherry picked from commit de41591477)
Change-Id: Ifbb5ecc4613319265a3378b60959fffc7301ae46
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
v5.13.0 v5.13.0-rc3 		2019-06-13 22:47:35 +03:00
Qt Submodule Update Bot
09180d3f95 Update submodules on '5.13.0' in qt5 
Change-Id: I8883876f4360b207000d7635838fd26adb6a2f73
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
 2019-06-13 14:04:22 +00:00
Qt Submodule Update Bot
305278ff93 Update submodules on '5.13' in qt5 
Change-Id: I4363311b5e75dd00eb5c869d013b701a2ef7ef49
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-06-12 22:31:12 +02:00
Jani Heikkinen
fd1f34192a Fix qt5.git builds 
some '-' is missing from qt5.txt causing coin to ignore all configurations
from that file. So adding enough '-' in title column to solve the issue.

Change-Id: I0b8fa6c98efeece1bf93592bbb60ca627962ceee
Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
 2019-06-12 13:39:26 +03:00
Qt Submodule Update Bot
d063074b0f Update submodules on '5.13.0' in qt5 
Change-Id: I0070b9d562cfb57bab5b6fad913e9dbdf2090b48
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
 2019-06-12 10:41:11 +00:00
Qt Submodule Update Bot
7b36e44d7a Update submodules on '5.13' in qt5 
Change-Id: Ic3abd12e65592ae218e47b96bf5e80ccf92807e3
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-06-11 22:31:13 +02:00
Qt Submodule Update Bot
0d7a64fd8c Update submodules on '5.13' in qt5 
Change-Id: I8a94229ad71e5ee71e77bbe27641239f6a6940dc
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-06-10 22:30:57 +02:00
Qt Submodule Update Bot
67ba0e70a1 Update submodules on '5.13.0' in qt5 
Change-Id: I499cced655cbac696eb8343c1f01bdf00c7dcc9c
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
 2019-06-10 11:56:07 +00:00
Qt Submodule Update Bot
bb18b48251 Update submodules on '5.13' in qt5 
Change-Id: I07ecded02a10f0d0849de89e36569e88c2d0cf8d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-06-09 22:30:57 +02:00
Qt Submodule Update Bot
f4bbadba41 Update submodules on '5.13' in qt5 
Change-Id: I4dae0c7ec72588d61f479074307bbe9515aeb895
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-06-08 22:31:05 +02:00
Qt Submodule Update Bot
14adbe74dd Update submodules on '5.13' in qt5 
Change-Id: Id5b714f25384e8b6db9d314d63344440fa459b17
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-06-07 22:31:13 +02:00
Qt Submodule Update Bot
5bba104a41 Update submodules on '5.13' in qt5 
Change-Id: I7bb7197fced3470b41e8d2b77f0af4617607ce97
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-06-06 22:31:14 +02:00
Qt Submodule Update Bot
50bd689155 Update submodules on '5.13.0' in qt5 
Change-Id: I093500e5ebc9e53766233919eaf66dd223529300
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
v5.13.0-rc2 		2019-06-06 11:39:44 +00:00
Qt Submodule Update Bot
220097d10c Update submodules on '5.13' in qt5 
Change-Id: Iad275ca3305f834c0ff484df8c6469931fbcb3d1
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-06-05 22:31:55 +02:00
Heikki Halmet
a05bd71ede Disable MySQL from packaging builds 
We can't link against 3rd party GPL libraries

Task-number: QTBUG-76081
Change-Id: Ia78c58b14349078259488eafb592c2f70dbf7241
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
 2019-06-05 13:25:23 +03:00
Qt Submodule Update Bot
81f478b533 Update submodules on '5.13.0' in qt5 
Change-Id: Ib895ddc3b6d81039e6661864d03f1c586a78dbba
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
 2019-06-05 11:55:31 +00:00
Qt Submodule Update Bot
c15485df43 Update submodules on '5.13.0' in qt5 
Change-Id: Ie903e4f8177b324ec981a1d57e7c2e0b4f76d585
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
v5.13.0-rc1 		2019-06-03 10:59:12 +00:00
Qt Submodule Update Bot
02404b0cec Update submodules on '5.13.0' in qt5 
Change-Id: Idc487281a4293ad8cc5ad494b79fd941efc820ce
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
 2019-05-31 04:08:58 +00:00
Qt Submodule Update Bot
f22f1007f4 Update submodules on '5.13.0' in qt5 
Change-Id: I1d1d7dd6d259b26f0c0216efd1976ac79b500e78
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
 2019-05-27 06:08:44 +00:00
Heikki Halmet
247b429c3c Install prebuilded OpenSSL 1.1.1b for Windows 7 
Change-Id: Ie1ec2d6aaeea8432a654741ed7969cc66c3da7f5
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
 2019-05-26 08:14:11 +03:00
Heikki Halmet
ebcfcbe69a Add Android x86_64 architecture 
Task-number: QTBUG-47672
Change-Id: If5044e601ceedcd47a1ab9299f6a8e5721314ecc
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
v5.13.0-beta4 		2019-05-25 08:47:52 +03:00
Juha Karjalainen
3e838f2a34 Provisioning: Change openssl version to 1.1.1b 
Use newest LTS version of openssl as support for 1.0.2 series
will end at end of 2019.

For windows 7 x86 openssl 1.0.2 will be used until all need fixed
are made to submodule tests

Task-number: QTQAINFRA-2327
Change-Id: I930d239cd139b6202ebdfb5cdc8068ff2ad0b8a3
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
 2019-05-22 15:34:04 +03:00
Qt Submodule Update Bot
b7c0e2db78 Update submodules on '5.13.0' in qt5 
Change-Id: I51a93793234d86494580ec6a9d53b7cd414c888b
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
 2019-05-23 04:17:14 +00:00
Juha Karjalainen
230a73409a Provision sed for windows 10 
Sed is needed by webassembly build. Cannot use sed from msys as
having msys bin folder in path breaks webassembly build.

Task-number: QTQAINFRA-2835
Change-Id: I6ad06f0a952a0d8bc5d21e62f8c2cef70f40c618
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
 2019-05-16 04:14:35 +00:00
Ulf Hermann
3e6a04c09d qtdeclarative platform config: Add missing quotes 
Change-Id: Ib8c0a2aad21718dba25728d3ac869c23f314554a
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
 2019-05-16 04:14:30 +00:00
Qt Submodule Update Bot
991500dc85 Update submodules on '5.13.0' in qt5 
Change-Id: Ibb7ad97a0fb6cbc2d7d8d77d0fd115c1d602ee07
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-05-16 04:14:23 +00: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
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