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,338 Commits 118 Branches 270 Tags
4175af18f8a56c8e9a372c28a8d800488f9f8a18
Commit Graph

3338 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jani Heikkinen
4175af18f8 Add Android x86_64 architecture 
It seems those build targets were accidentally deleted when
yaml change was merged in. Targets were there in Qt 5.13.0 release
(before yaml change)

This amends a94696ccd5.

See also ebcfcbe69a.

Task-number: QTBUG-47672
Change-Id: If2c22a8b995fdaa967f81062d0fae6dc725829dd
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
 2019-08-13 22:11:31 +00:00
Simo Fält
d19f60d745 Provisioning: Append the emscripten to path instead of prepend 
Having it first in path seems to cause some confusion when detecting
libc++ in darwin.

Change-Id: I841e7f169e4771d3818cf156d9d78fc242e9995c
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
 2019-08-12 21:01:55 +00:00
Qt Submodule Update Bot
19cc6b2b80 Update submodules on '5.13.1' in qt5 
Change-Id: Ibe04f05d2195953f6ab7305472d1700ec1c73312
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-08-12 21:25:08 +02:00
Liang Qi
f32c9f755e Include QtWebEngine again 
This reverts commit a94696ccd5 partially.

Task-number: QTBUG-77304
Task-number: QTBUG-77305
Change-Id: Iae17b2358d39a1d22271b2eb5c73b272a43adb28
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
 2019-08-08 22:51:04 +02:00
Qt Submodule Update Bot
0f89c02328 Update submodules on '5.13.1' in qt5 
Change-Id: I73c133a6ae2e6a84cd21f3d4f19803d510d23e04
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-08-08 22:50:57 +02:00
Liang Qi
9b186a9d36 Merge "Merge remote-tracking branch 'origin/5.12' into 5.13.1" 2019-08-08 22:50:52 +02:00
Liang Qi
03d4a54e34 Merge remote-tracking branch 'origin/5.12' into 5.13.1 
Conflicts:
	.gitmodules
	coin/platform_configs/qtbase.yaml

Change-Id: I964ffb430436c62ad675fabc853642800499ade3
 2019-08-08 15:31:47 +02:00
Liang Qi
42bfac5bf8 Include qtvirtualkeyboard again 
This partially reverts commit 452e0d94d4.

Task-number: QTBUG-76371
Change-Id: Ic45690899c0fc0a7fd38d1c348481fdec09cccf8
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
 2019-08-08 14:19:46 +02:00
Tony Sarajärvi
b88acae7a8 Partially revert 'Do DeveloperBuild for Boot2Qt' 
This partially reverts commit 8f073cea69.

Autotests slow down way too much still, so we can't run developers
builds eveywhere.

Task-number: QTBUG-63152
Task-number: QTBUG-77304
Task-number: COIN-326
Change-Id: I04b673c2ebfae6c0f6cbc09242cce2e273c7111c
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
 2019-08-08 12:19:38 +00:00
Qt Submodule Update Bot
f08bd26eeb Update submodules on '5.12' in qt5 
Change-Id: If3c40151c06c593327eee7a2394e7495bc11bb55
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-08-08 11:45:10 +02:00
Qt Submodule Update Bot
f511a2d74f Update submodules on '5.13.1' in qt5 
Change-Id: I6073c33388af514d7eb0f014b13cb6694235f650
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-08-07 12:14:24 +02:00
Qt Submodule Update Bot
2b738468de Update submodules on '5.13.1' in qt5 
Change-Id: Ia6d7873072055e86c1aea5c33694ba376a867fa3
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-08-07 10:35:33 +02:00
Liang Qi
f8439ea42c Merge "Merge remote-tracking branch 'origin/5.13' into 5.13.1" 2019-08-07 10:35:16 +02:00
Liang Qi
13b206662b Merge remote-tracking branch 'origin/5.13' into 5.13.1 
Notice - qtvirtualkeyboard and qtwebengine got ignored
temporarily due to issues on QEMU.

 Conflicts:
	.gitmodules

Change-Id: Iefab0fa5172c976ca06b3f33772c4c4bc10763c2
 2019-08-06 11:46:15 +02:00
Qt Submodule Update Bot
2fb0e4f352 Update submodules on '5.13' in qt5 
Change-Id: I9498fe9045d23ec400d9437f375d547f054909b8
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-08-06 06:12:03 +02:00
Qt Submodule Update Bot
2970d3660c Update submodules on '5.13' in qt5 
Change-Id: If5c6d3363438d613e5ea96bc84018ef913067296
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-08-05 11:28:51 +02:00
Liang Qi
1e476b01fd Merge "Merge remote-tracking branch 'origin/5.12' into 5.13" 2019-08-05 11:28:39 +02:00
Liang Qi
58977376e1 Merge remote-tracking branch 'origin/5.12' into 5.13 
Change-Id: Ie49f7e5ff9ca02522c6611922b47870aba2c152e
 2019-08-04 11:51:40 +02:00
Tony Sarajärvi
9da27c5808 Add macOS 10.14 to the CI 
Task-number: QTQAINFRA-2938
Change-Id: Id25c6c3203a07985c9ef1cc914c4398ac7db615c
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-08-03 23:01:34 +03:00
Liang Qi
689ed30f2a Merge "Merge remote-tracking branch 'origin/5.12' into 5.13" 2019-08-03 00:08:09 +02:00
Liang Qi
a94696ccd5 Merge remote-tracking branch 'origin/5.12' into 5.13 
Conflicts:
	.gitmodules
		ignore QtWebEngine on QEMU temporarily.
	coin/platform_configs/default.yaml
		no-gui build was removed temporarily.
	coin/platform_configs/qt5.yaml
	coin/platform_configs/qtbase.yaml
	coin/platform_configs/qtconnectivity.yaml
	coin/platform_configs/qtsaferenderer.yaml

Task-number: QTQAINFRA-2576
Task-number: QTBUG-77304
Task-number: QTBUG-77305
Done-With: Tony Sarajärvi <tony.sarajarvi@qt.io>
Change-Id: If7cf75791677eace762374b92382a2ce15f17f55
 2019-08-03 00:02:43 +02:00
Qt Submodule Update Bot
4c5d3f2e43 Update submodules on '5.13' in qt5 
Change-Id: Ia8f240a565043822fec60ce29b348bb79846919e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-08-01 22:31:04 +02:00
Konstantin Tokarev
125c5e6528 Provisioning: update conan_manifests for libxslt packages 
Package recipe was improved, as a result packages were rebuilt and
checksums need update.

Change-Id: I33bd30b44cbe48b3550cb42eeb995ef8588fcce7
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2019-08-01 14:24:56 +03:00
Konstantin Tokarev
b521ad483c Update platform_configs for QtWebKit 
* Remove redundant MSVC2017 configuration
* Synchronize Mingw73 configuration with qt5.txt

Change-Id: I05557ecbf57206fe56ff113f893c37a65f503bf0
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2019-08-01 14:24:48 +03:00
Jani Heikkinen
30b0d05343 Remove 'Packaging' feature from WinRT_10 x86 
We don't deliver binaries for that target anymore -> do not export that
either

Change-Id: Iccf408adeaed071294e10774a5a0c21ec8bd8014
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
 2019-08-01 12:31:28 +03:00
Qt Submodule Update Bot
72f1742097 Update submodules on '5.13' in qt5 
Change-Id: I6f218e6cc6c7de9a4f87f63814e01079a7ab1b02
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-08-01 10:48:34 +02:00
Qt Submodule Update Bot
d3fbd2ed1a Update submodules on '5.12' in qt5 
Change-Id: Ie88f0f640e5cd5ad3e3bb159e0b2c248fddc4d40
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-07-31 23:31:05 +02:00
Juha Karjalainen
38e416be66 Add webAssembly build for windows and macos 
Provision emsdk and its dependecies to windows and macos.

Task-number: QTBUG-63917
Task-number: QTQAINFRA-2835
Done-with: Juha Karjalainen <juha.karjalainen@qt.io>
Change-Id: I24ea9cbc4f7cc95e6952765099d5e46247470011
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
 2019-07-31 09:44:53 +03:00
Qt Submodule Update Bot
e6823acbc7 Update submodules on '5.13' in qt5 
Change-Id: I78f3250367bf544dd8a5b5f1a0cd91c20655e065
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-07-30 20:08:39 +02:00
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
f84c90706d Update submodules on '5.12' in qt5 
Change-Id: I2a96915081171e92e91e5a595e87cd2e0b991a51
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-07-28 23:30:53 +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
Konstantin Tokarev
716640a477 Provisioning: update Conan and Conan packages 
[*] Update Conan to 1.17.0, adjust to change in command line arguments
[*] Update Conan packages to up-to-date versions, add libjpeg-turbo and
    packages for 64-bit MinGW
[*] Rename 03-conan.ps1 to 11-conan.ps1 so that it is installed after
    Python 3 and MinGW
[*] Add license header to conan.ps1

Change-Id: Ibc451ddc54a7227eb6d3a007a20351e77a46875f
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
 2019-07-26 19:52:45 +03:00
Konstantin Tokarev
4bf0ba2ba1 Provisioning: Add CompilerException and CompilerThreads settings for Conan 
Change-Id: I3a52101056bce4d3d4ac9124dbfd566adf47cf80
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
 2019-07-26 19:52:37 +03:00
Konstantin Tokarev
2666f3b216 Provisioning: rename 03-conan.ps1 to conan.ps1 to follow naming convention 
Change-Id: If24541709d4675498bc4af296e05ce3c62d5045a
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
 2019-07-26 19:52:24 +03:00
Konstantin Tokarev
535dbcfe96 Conan: Suppress output of New-Item 
Change-Id: I3d62fffa08d38a383187726e08743512236bb859
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
 2019-07-26 19:52:18 +03:00
Qt Submodule Update Bot
41abae4367 Update submodules on '5.12' in qt5 
Change-Id: I0b682ebd4643a85f04cb2192efb97e8c5230759a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-07-26 09:59:29 +02:00
Konstantin Tokarev
f12c226463 Provisioning: install-msys2.ps1 must run its commands synchronously 
[*] Using bash instead of msys2_shell.cmd allows Start-Process to actually
    wait for the end of command execution.
[*] cpan requires "yes" to be typed by user when it's run first time,
    otherwise it hangs indefinitely waiting for input.
[*] Stop gpg-agent and dirmngr started in the background to prevent
    CI session from hanging.

Change-Id: I4d4c1f36d215cb7578d1e7059217e34375de96c6
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
 2019-07-26 07:50:43 +03:00
Konstantin Tokarev
22c427b369 Use msiexec to install Strawberry Perl from msi package 
Currently provisioning fails with following error:  "This command cannot
be run due to the error: %1 is not a valid Win32 application."

Change-Id: I59290d394f231c37af10f27d07dbb9f5d2d2470a
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
 2019-07-26 07:50:41 +03:00
Konstantin Tokarev
645bd71404 Provisioning: Run-Executable should print stdout and stderr to log 
Task-number: QTQAINFRA-3085
Change-Id: I5343753f75157a2a894bb3ac50d416ab044d86fb
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
 2019-07-26 07:50:38 +03:00
Konstantin Tokarev
cb8d38fd9c Provisioning: don't re-run Conan 5 times if there is no error 
Change-Id: Ia348ebbc4fc3a2503cc426c011e68b7a410c4a08
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2019-07-26 07:50:35 +03: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
dd7a80d757 Update submodules on '5.12' in qt5 
Change-Id: Ife94a7c6264fbb4525ba2cd0370bdf1ba454b7c6
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-07-25 10:15:39 +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
Qt Submodule Update Bot
2237ea6d0c Update submodules on '5.12' in qt5 
Change-Id: I09887cc4b1e103b9341f096c4c9164f4a96bd431
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-07-23 09:59:39 +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
Qt Submodule Update Bot
cfe2c097e9 Update submodules on '5.12' in qt5 
Change-Id: Ib0b559d638d7ae6df4129b97f433b168af757443
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-07-14 23:30:51 +02:00