lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-02-03 23:16:24 +08:00
Code Issues Packages Projects Releases Wiki Activity
2,903 Commits 118 Branches 270 Tags
2a7ea7c53dfa66c8d53445aeae6776516236a730
Commit Graph

2903 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Qt Submodule Update Bot
2a7ea7c53d Update submodules on '5.12' in qt5 
Change-Id: Icca1ee8d9b84ca8766e2b6a774098f936970b3ab
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2018-12-18 08:20:33 +00:00
Heikki Halmet
deacc72f73 Provisioning: Hide squish installation output from provisioning log 
This will prevent the output of unwanted information

Change-Id: I547e91ef344ec51f799b26f254139b03d20a315c
Reviewed-by: Simo Fält <simo.falt@qt.io>
 2018-12-17 07:16:39 +00:00
Liang Qi
65586dfb40 Update submodules on '5.12' in qt5 
Skip qtdeclarative in this round due to QTBUG-72527.

Change-Id: I97aa9c1f472e88b3339dc39d841a5ef324b6fd90
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2018-12-14 16:36:59 +00:00
Liang Qi
43b493d223 Merge remote-tracking branch 'origin/5.11' into 5.12 
Change-Id: I262b06902381426b304d815265662a315e217c0a
 2018-12-12 20:39:25 +01:00
Qt Submodule Update Bot
a51b2dbf25 Update submodules on '5.12' in qt5 
Change-Id: Ib45df166b0096ec1ec198e6cba792cd8a41c05a7
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2018-12-12 13:49:50 +00:00
Oliver Wolff
7bee789af3 Add configuration to run qtconnectivity tests on winrt 
Change-Id: Ib9b61b19033d4ceb7ce15ecc8c1a0227b53bb669
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
 2018-12-12 13:49:45 +00:00
Juha Karjalainen
e21401751a Provisioning: Change how executables are waited to finish 
This patch only affects Windows.
Python3 provisioning took over 30-35 minutes. As both
32 and 64 bit versions are provisioned it took over 1h
this change lowers time taken to 5 minutes.

start-process with -wait flag waits for given process and its
sub-processes to exit.  Wait-process insteads just waits for
process to exit.

Change-Id: Ib9a323dcf9e2d07318a0d259a72ca4c4d0a4ed80
Reviewed-by: Simo Fält <simo.falt@qt.io>
 2018-12-12 13:49:42 +00:00
Juha Karjalainen
bc12bb763f Provisioning: Windows 10 32bit remote desktop access allow 
Allow accessing windows remote desktop.

Task-number: QTBUG-71874
Change-Id: I70c0acc309bd5e2bc590e7cd35a918ca7940fd03
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
 2018-12-12 13:49:39 +00:00
Heikki Halmet
a1cd361579 Provisioning: Add missing prefix for yocto_ssh_configurations 
Change-Id: I1a49737188cff6291b16797293a221043bdddad1
Reviewed-by: Juha Karjalainen <juha.karjalainen@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
 2018-12-12 13:49:35 +00:00
Qt Submodule Update Bot
b093af0207 Update submodules on '5.11' in qt5 
Change-Id: I72f653e9bdbece531d9d8d053e80d547a5ad56d5
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2018-12-10 17:22:19 +00:00
Liang Qi
37eb5a63b7 Merge remote-tracking branch 'origin/5.11.3' into 5.11 
Change-Id: Iaa9c11ed5435e297e87b225060ea892bdb18deef
 2018-12-09 20:32:46 +01:00
Qt Submodule Update Bot
e49086eb0d Update submodules on '5.11' in qt5 
Change-Id: I07f616fb66b4b3e0f2a5a216c9fe56c0a0f42d6e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2018-12-04 04:31:00 +00:00
Qt Submodule Update Bot
785042ea87 Update submodules on '5.12' in qt5 
Change-Id: Ibd42172f2b956c18c692bf125390554e5868a438
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2018-12-03 18:25:11 +00:00
Qt Submodule Update Bot
c6b7e8d8a8 Update submodules on '5.11' in qt5 
Change-Id: Idbb6f72e0092d564d76c81f41470e5d687864a00
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2018-12-01 07:49:11 +00:00
Qt Submodule Update Bot
2d30a2442c Update submodules on '5.11' in qt5 
Change-Id: I7f6500a82a0967a0adafe719647f40013457a2a5
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2018-11-30 15:15:37 +00:00
Qt Submodule Update Bot
5a1c876ec7 Update submodules on '5.12' in qt5 
Change-Id: Id7db93fe860bd6986e4565c91fa03674306b7b88
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2018-11-29 21:31:07 +00:00
Tony Sarajärvi
4de6c12b17 Don't set http_proxy in its own subshell 
The subshell actually meant, that the http_proxy environment
variable was never seen outside that check. Thus proxy was never
used where this was checked.

Change-Id: I069f43f13dffca98d8b60a47c2e105209018c84d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
 2018-11-29 20:20:26 +00:00
Gatis Paeglis
22e5bda9a9 provisioning: RHEL-7.4 install xcb-util-* packages 
We do install them on Ubuntu and openSUSE. Eventually we want to stop
using bundled xcb libraries. Currently all builds of Qt on Linux use
-qt-xcb switch (see coin/src/targetenvironments.py::LinuxTargetEnvironment),
which is the reason why things build fine, even when packages are not
present on the system.

Change-Id: I856ddb5a17768b347aec3e593d6b969109a5c3a3
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
 2018-11-29 20:20:13 +00:00
Gatis Paeglis
d9a869707e provisioning: consistently install libxkbcommon* on linux distros 
Ubuntu was the only distro that installed both of the required packages:

installPackages+=(libxkbcommon-dev)
installPackages+=(libxkbcommon-x11-dev)

RHEL 7.4 did not explicitly install any, but got libxkbcommon-dev
pulled in as gtk3 dependency. Extract from provisioning log:

--> Processing Dependency: pkgconfig(xkbcommon) >= 0.2.0 for package: gtk3-devel-3.22.30-3.el7.x86_64
---> Package libxkbcommon-devel.x86_64 0:0.7.1-1.el7 will be installed

openSUSE explicitly installed libxkbcommon-devel, but not libxkbcommon-x11-devel.

Qt official binaries are built on RHEL, where we do not have
libxkbcommon-x11-dev installed. This means that XCB plugin and
Compose input plugin would fallback to using bundled sources.
It was actually desired until now that XCB/Compose use the
bundled sources instead of linking with the library from the
system, but this was only a lucky side effect. If we had installed
libxkbcommon-x11-dev on RHEL, then Qt binaries would end up
linking with the libxkbcommon from the system, because of the
missing "-qt-xkbcommon" configre switch for release builds.
We won't bundle libxkbcommon anymore, hence we need to install
the missing dependencies, as done by this patch.

Change-Id: I5c7b8ac38c266ce81cb5a3189a9082bfd581ee31
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
 2018-11-29 20:19:57 +00:00
Qt Submodule Update Bot
1af77cdacf Update submodules on '5.11' in qt5 
Change-Id: I809770ab61b7f7544f96b218f89f55c66360e7b8
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2018-11-29 06:42:42 +00:00
Qt Submodule Update Bot
6ea6c85f06 Update submodules on '5.12' in qt5 
Change-Id: I3641f84b3395cbb306be44e01beefceb776b2ed5
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2018-11-29 06:42:34 +00:00
Juha Karjalainen
1deea3debc Provisioning: Update openssl to version 1.0.2p 
Task-number: QTQAINFRA-2266
Change-Id: I3f09d9169f17bcd83dcfd72547440bca487fd9db
Reviewed-by: Simo Fält <simo.falt@qt.io>
(cherry picked from commit 3b4ca5d6c0)
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
v5.11.3 		2018-11-27 05:44:26 +00:00
Qt Submodule Update Bot
76b9b7dbd3 Update submodules on '5.11.3' in qt5 
Change-Id: I57a880017b682818a6ff0d8d6aaca204a5a7e87f
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
 2018-11-27 05:44:22 +00:00
Qt Submodule Update Bot
7eff84a7e5 Update submodules on '5.12' in qt5 
Change-Id: I522ab6944a7d30421e8087c9406c383c004cf7a7
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2018-11-25 08:48:33 +00:00
Qt Submodule Update Bot
4f4361e9fd Update submodules on '5.12' in qt5 
Change-Id: I8259419a5f66db5da640c0d39fcc8a4410634767
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2018-11-23 08:12:30 +00:00
Ryan Chu
3ae624cd6e Docker Provisioning: Remove the fixed version of package dependencies 
Free the dependencies of the specific Ubuntu packages. Ensure that test
server is using the latest version of the Ubuntu packages to test
network changes. Otherwise, all the docker files need to be manually
updated when upgrading to the next Ubuntu version (e.g. 18.04).

For debugging purpose, the installed packaged will be listed in the
provisioning logs.

Change-Id: I38d119d11f33cfd60dc34fcd57ec0fe1615e98f2
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
 2018-11-22 07:57:53 +00:00
Qt Submodule Update Bot
8437deb219 Update submodules on '5.12' in qt5 
Change-Id: I3cf40a50955c7de9808932c14a50433c30828322
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2018-11-22 07:57:49 +00:00
Qt Submodule Update Bot
5c4d85a9b9 Update submodules on '5.11.3' in qt5 
Change-Id: I82d312c03bf12d9afe81316aad9a41bd4c4859e3
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2018-11-21 06:34:37 +00:00
Liang Qi
0c839f87fb Merge remote-tracking branch 'origin/5.11' into 5.12 
Conflicts:
	coin/provisioning/common/unix/mqtt_broker.sh

Change-Id: I990dbf66b7120f2f1bcf202f0a2547a5ad9881f2
 2018-11-20 19:37:06 +01:00
Qt Submodule Update Bot
2a4eafbc77 Update submodules on '5.12' in qt5 
Change-Id: I00f8fe0ed2f8dd23ccb8bd093485f7d14bf15181
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2018-11-20 18:00:43 +00:00
Qt Submodule Update Bot
a9a4b97c70 Update submodules on '5.11' in qt5 
Change-Id: Iaf5b3d17d80e26c1c205f5f18e16325ac9997484
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2018-11-20 04:30:56 +00:00
Qt Submodule Update Bot
50b85b0d38 Update submodules on '5.11' in qt5 
Change-Id: Ifb302b8a2674c775e37605658f5451cf41eb0c58
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2018-11-17 21:23:23 +00:00
Qt Submodule Update Bot
0b488e88e7 Update submodules on '5.12' in qt5 
Change-Id: I0006d5ddd851caaac5939ab2d0af2b2a09d3fdd3
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2018-11-17 09:10:45 +00:00
Qt Submodule Update Bot
579d0ff553 Update submodules on '5.12' in qt5 
Change-Id: I4a85369e42e3b8fe36ee754e46d8f9cc482e901d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2018-11-16 10:39:44 +00:00
Qt Submodule Update Bot
ac63ffa071 Update submodules on '5.12' in qt5 
Change-Id: I8e14dc23368e1eef5cefe9696adc3dd75affa501
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2018-11-15 07:20:49 +00:00
Qt Submodule Update Bot
3094200a9f Update submodules on '5.12' in qt5 
Change-Id: I9eed8d0a199294a41568c21640cf88b462035304
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2018-11-14 08:31:07 +00:00
Qt Submodule Update Bot
5b1848c02a Update submodules on '5.11' in qt5 
Change-Id: Id003008d7ca8599fc4e1c5c06997659a04370ce3
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2018-11-14 08:22:16 +00:00
Qt Submodule Update Bot
fbf22546be Update submodules on '5.11.3' in qt5 
Change-Id: Ie32ea1823a1e4d33d4077db3c5d856b3ea216d90
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2018-11-13 18:40:34 +00:00
Qt Submodule Update Bot
fb83a49c30 Update submodules on '5.12' in qt5 
Change-Id: Ic1a6f9bd8ec1ee005d437f81f8cda3348ce9ea72
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2018-11-13 05:54:35 +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
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
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