lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-03-17 17:56:11 +08:00
Code Issues Packages Projects Releases Wiki Activity
2,817 Commits 120 Branches 272 Tags
9bfa486dd097723bd2fc0d8d85ebfb8dca6bbe12
Commit Graph

2817 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Heikki Halmet
dc5f851e78 Provisioning: Add common shared folder 
Common shared folder includes scripts of files which are common for all
operating system families. Changes under shared folder will trigger
provisioning for all platforms

Change-Id: I0789f87b76876d5f92673fe2f0e72d770e5f5ea4
Task-number: QTQAINFRA-1451
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
 2018-01-26 13:12:47 +00:00
Tony Sarajärvi
c4cf4fa07f Add nfs-common for mounting to work 
Task-number: QTQAINFRA-1690
Change-Id: I43453da3267664c664e80510e3750d1906d00078
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
 2018-01-26 13:12:44 +00:00
Joni Jantti
6d1190aaa0 Provisioning: Use SetEnvVar helper function in scripts 
Currently when adding an environment variable in provisioning we have
to check if the system is Ubuntu and use .profile instead of .bashrc.
This check should be done in a function so we don't have to duplicate
it for every provisioning script separately.

Change-Id: I2fa128032123e17d20dfb39cd3668e22e4bb0d55
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
 2018-01-26 13:12:41 +00:00
Qt Submodule Update Bot
7681e742d7 Update submodules on '5.9' in qt5 
Change-Id: Ie34e726ef71d33bb0726a10886edd3153783376a
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2018-01-26 13:12:39 +00:00
Liang Qi
3c3d56c0cc Update submodules on '5.10' in qt5 
Change-Id: I7823fe54729d3b385e11b1a2f7b6f6cfec6ebe55
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2018-01-26 07:54:42 +00:00
Qt Submodule Update Bot
c0b7daeb10 Update submodules on 'dev' in qt5 
Change-Id: I3b1e1f1b46d3cb067e335ce1bef0da3046afed8e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2018-01-24 23:01:47 +00:00
Oswald Buddenhagen
282899453d Adjust submodule branches 
Change-Id: Id6fe05f393152581b8509fd613084df1f318bc54
 2018-01-24 17:49:00 +01:00
Samuli Piippo
953dc011b2 Enable ARM64 build for QNX7 
Change-Id: Ic30f4032c73ec16a9f1b93b3afee1e9812074bb7
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
 2018-01-24 10:24:13 +00:00
Qt Submodule Update Bot
352b30a15d Update submodules on '5.10' in qt5 
Change-Id: I92a54351148ee369eaacca6064c12b73f18be4da
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2018-01-24 08:55:01 +00:00
Qt Submodule Update Bot
e32dd4fe58 Update submodules on '5.10' in qt5 
Change-Id: Id21e7a1007ee9ea956431fe84890337074271f7d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2018-01-23 07:58:13 +00:00
Qt Submodule Update Bot
fc840c3459 Update submodules on 'dev' in qt5 
Change-Id: Id6db5f3aa546198917e3e14e53c47126c9f4a012
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2018-01-23 05:21:41 +00:00
Frederik Gladhorn
052b4b5844 Merge remote-tracking branch 'origin/5.10' into dev 
Change-Id: I1031266ae727e7bfeae71bf3faed9b5197c16247
 2018-01-22 12:19:10 +01:00
Qt Submodule Update Bot
b6a1e9f07e Update submodules on '5.10' in qt5 
Change-Id: I9405e2dc8a6a93cbf5d7f86d8dbfd9a96c8b41b1
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2018-01-21 07:36:34 +00:00
Qt Submodule Update Bot
09ec294210 Update submodules on '5.9' in qt5 
Change-Id: Iaadacb41390a5b028d99d4427895af6529b13b59
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2018-01-20 14:27:18 +00:00
Qt Submodule Update Bot
5f57762934 Update submodules on '5.10' in qt5 
Change-Id: I0a49d2eb0c8a7b7a16aa32ba24924299f6d40270
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2018-01-20 14:19:44 +00:00
Tony Sarajärvi
dc1560dbef Add dependencies needed to build Yocto 
Task-number: QTQAINFRA-1690
Change-Id: I9583c39709849d058e6d44473e074e9327907dd8
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
 2018-01-19 11:29:58 +00:00
Liang Qi
45528e6874 Merge remote-tracking branch 'origin/5.9' into 5.10 
Change-Id: I0fdced87d2064e8459fa0b9c4e16a53c1f44ac0a
 2018-01-19 09:56:46 +01:00
Qt Submodule Update Bot
4319f7da72 Update submodules on 'dev' in qt5 
Change-Id: I6a9db841c7c6c9eba6248072caa8069dacb853da
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2018-01-19 05:26:04 +00:00
Joni Jantti
786be66eaf Move exception throw to the correct line 
This throw was placed on the echo line instead of the actual command.

Change-Id: I907c2ce17afa64c9c4ef628d766d7dfe270ade59
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
 2018-01-19 05:25:09 +00:00
Qt Submodule Update Bot
31a0826fe8 Update submodules on '5.9' in qt5 
Change-Id: I48a99c5161698f833ab0f0798690e5fa963057d5
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2018-01-19 05:25:02 +00:00
Qt Submodule Update Bot
21e7344389 Update submodules on '5.10' in qt5 
Change-Id: I7b7796d1651b5b1384f543b9e64c0c836113689c
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2018-01-19 05:24:06 +00:00
Liang Qi
57ba8230bd Merge remote-tracking branch 'origin/5.9.4' into 5.9 
Change-Id: I1c5c5e6e938f33dd8b0b9c40e64d509eeec25774
 2018-01-18 23:41:16 +01:00
Oliver Wolff
99595f44f1 Provisioning: Fix disabling windows updates 
On some machines the updates were already disabled, which lead
to the call to disable the service failing. Now we just move on without
error.

Change-Id: Ia48f7164c23dfe24e24548558d582cdc0190b7e3
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
 2018-01-18 21:08:25 +00:00
Frederik Gladhorn
b86b3a757b Fix provisioning: NotePad++ path on 64 bit windows 
We install the 64 bit version of np++ which is installed in the regular
program files folder.

Change-Id: I702210eaf7dfae75bbfcfd9cc98d8ed96d775f61
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
 2018-01-18 21:08:21 +00:00
Frederik Gladhorn
b1198d3402 Fix provisioning: Wait for msvc-2013 update 5 to finish 
Installing Update 5 for Visual Studio 2013 Update 5 (KB2829760)...
Removing C:\Windows\Temp\vs12-kb2829760.exe ...
Caught System.UnauthorizedAccessException
Access to the path 'C:\Windows\Temp\vs12-kb2829760.exe' is denied.

Change-Id: I9fe136f0361ee21e38563dd17bf76bf4fd53747f
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
 2018-01-18 21:08:19 +00:00
Tony Sarajärvi
7c66e59832 Add nfs-common for mounting to work 
Task-number: QTQAINFRA-1690
Change-Id: I43453da3267664c664e80510e3750d1906d00078
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
 2018-01-18 16:33:18 +00:00
Tony Sarajärvi
f2f9b14cee Consolidate provisioning script name for qnx in macOS 
Change-Id: Id07686bcc677b62a4981a46cabefd40b544815c5
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
 2018-01-18 16:33:13 +00:00
Liang Qi
762530ba70 Update submodules on 'dev' in qt5 
Change-Id: I30571e17dc4fafbaf66232546bf33ba4965d36e8
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2018-01-18 07:21:08 +00:00
Qt Submodule Update Bot
b22fccf5ba Update submodules on '5.10' in qt5 
Change-Id: Ibbbd5202c450921ba47c33e28034fce631e82546
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2018-01-18 05:14:41 +00:00
Jani Heikkinen
2348ead529 Revert "Add 'ForceDebugInfo' -flag to linux desktop binaries" 
Now debug symbols are added in qtlibs as well and library size
is huge. We need additional 'separate_debug_info' flag in
addition to this but currently there isn't support for it in
coin. That's why we need to revert this change until coin has
full support for this.

This reverts commit b0b6b05b34.

Change-Id: I7d36d2778433d2034420c209b73d21b5af32249f
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
v5.9.4 		2018-01-18 05:09:07 +00:00
Qt Submodule Update Bot
8aec4db6a6 Update submodules on '5.9.4' in qt5 
Change-Id: I21728a4b47373450defe1a90bd9bcf4680f323af
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
 2018-01-18 05:09:01 +00:00
Oliver Wolff
e33ef922ba Use "correct" registry when enabling Windows 10 Developer Mode 
As coin is running a 32 bit application the registry key ended
up in the Wow6432Node compatibility area of the registry when run
on a 64 bit Windows. Windows does not use this place to check
for the developer mode setting, so we use the "proper" registry
instead.

If adding the registry key fails the script now reflects that
and exits with a proper exit code.

Change-Id: Ifd6bc7e7b0ed6595a2a967597ab45053cb51e7aa
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
 2018-01-17 16:47:54 +00:00
Qt Submodule Update Bot
b55370e356 Update submodules on '5.10' in qt5 
Change-Id: I986f33a9a04f1172c5fbfe37a45f984837a2a684
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2018-01-17 13:14:49 +00:00
Frederik Gladhorn
6a875b9f81 Fix checksum for QNX 7 SDK download 
Change-Id: Ia37c6d032d1a4c2841482292a2c2c2f8fd468859
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
 2018-01-17 12:20:52 +00:00
Qt Submodule Update Bot
d1aeb5c569 Update submodules on '5.9' in qt5 
Change-Id: I0e7cb3a46909c3b72e2639b9ef2214428bd02cb6
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2018-01-17 12:15:25 +00:00
Qt Submodule Update Bot
5ee73db243 Update submodules on '5.10' in qt5 
Change-Id: I43c91914547bb1b27f29ce948707eaf4b8373825
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2018-01-16 08:01:20 +00:00
Qt Submodule Update Bot
113ad91c98 Update submodules on '5.9.4' in qt5 
Change-Id: I103ce41b4b7c576e36b43215401e83e43a0e522e
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2018-01-14 17:28:22 +00:00
Liang Qi
1c7ba877cc Move QNX 7 arm build from qt5 to default 
QNX 6.6 builds were removed. We need to check QNX in submodules
build.

This change amends 357de3ea13.

Change-Id: Ia04256bf35e45f111f73661c6f3ca445253900ec
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
 2018-01-14 08:59:49 +00:00
Qt Submodule Update Bot
1540a87590 Update submodules on '5.9' in qt5 
Change-Id: I968ccd381929d89ef988d3ac2f468b25cbeb8365
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2018-01-13 15:41:12 +00:00
Heikki Halmet
6e4f2f8433 Fix common folder paths for common split change 
Change-Id: I9d3f1ce71d7995c88005b81f7f9dc9db892e9de7
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2018-01-13 07:31:51 +00:00
Liang Qi
da80efa880 Merge remote-tracking branch 'origin/5.9' into dev 
Change-Id: I9a419b82cc05549f6d8e6394bec5c349aa1c9c63
 2018-01-12 21:14:23 +01:00
Liang Qi
c2d188f225 Merge remote-tracking branch 'origin/5.10' into dev 
Conflicts:
	coin/platform_configs/default.txt
	coin/platform_configs/qt5.txt

Task-number: QTBUG-65688
Change-Id: I17a303731dab4b967c9ef8a852ee0c1097b88f10
 2018-01-12 21:13:56 +01:00
Liang Qi
4175522924 Merge remote-tracking branch 'origin/5.9' into 5.10 
Change-Id: Idf9c18da5527327178887c257fc56dbc27e1c8ad
 2018-01-12 12:06:07 +01:00
Liang Qi
ab25cb7af6 Update submodules on 'dev' in qt5 
Change-Id: Iae26c4fdcf07ff7cd1ff53a98ce0fcbf4af1ffac
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2018-01-12 08:22:34 +00:00
Qt Submodule Update Bot
fb1c052f3b Update submodules on '5.9' in qt5 
Change-Id: I7cfbf55bc3b57092e5f20a32866bb9cfa9160b9b
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2018-01-11 20:01:11 +00:00
Frederik Gladhorn
d8e1574d5f Install p7zip-full, that contains the 7z binary 
p7zip is only a minimal version containing 7zr.

Change-Id: I12531514490b6eb871419bdb61ea5896b175a678
Reviewed-by: Simo Fält <simo.falt@qt.io>
 2018-01-11 14:20:50 +00:00
Liang Qi
19872ea843 Merge remote-tracking branch 'origin/5.9' into 5.10 
Fixed up provisioning script locations after the reshuffeling into
common/platform folders.

Change-Id: Ia0b7d076e475ccc207f2955572fb9ab4171e5d9d
 2018-01-11 15:13:13 +01:00
Qt Submodule Update Bot
271fedaf88 Update submodules on '5.10' in qt5 
Change-Id: If56253b74477a0bdc034f1daf32920d3363a27f4
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2018-01-11 06:42:49 +00:00
Qt Submodule Update Bot
3e96fec2e1 Update submodules on '5.9' in qt5 
Change-Id: If0b6b7bdb5151aa7488afed379785de63ca3aef2
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2018-01-11 05:22:31 +00:00
Konstantin Tokarev
ebe2b86fd0 Remove 'Packaging' flag from QtWebKit MSVC2017/x86 
Qt doesn't provide binaries for this platform.

Change-Id: Iab30435bb480ee898c2409f87facabb26fce9421
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
 2018-01-10 10:35:59 +00:00