Liang Qi
c41dd34de7
Update submodules on '5.10' in qt5
...
Change-Id: I550202469e06a974a942fbc7f207a09236f84a7d
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-10-19 11:39:19 +00:00
Qt Submodule Update Bot
9a096e6841
Update submodules on '5.10' in qt5
...
Change-Id: I2bf9e16177826276d6b6f5f8aa1a6708d62912a8
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org >
2017-10-05 06:54:38 +00:00
Qt Submodule Update Bot
ae9f6019bc
Update submodules on '5.10' in qt5
...
Change-Id: Ifedd5a9d3cce47323ff432d7237b1156f4469bdf
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org >
2017-10-04 06:36:18 +00:00
Qt Submodule Update Bot
cf0a8af55d
Update submodules on '5.10' in qt5
...
Change-Id: I66c6ad9f0c47757615bf9398ccaa2889d22681fd
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org >
2017-10-02 08:29:12 +00:00
Qt Submodule Update Bot
35a3ba35ef
Update submodules on '5.10' in qt5
...
Change-Id: Ifae0935db8d9862051b605438a4f713dd7e97a34
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org >
2017-10-01 09:02:32 +00:00
Qt Submodule Update Bot
7983297c8b
Update submodules on '5.10' in qt5
...
Change-Id: I511688940a93b3e86c0d4782cf332788e390933b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org >
2017-09-30 09:29:14 +00:00
Qt Submodule Update Bot
e9c5f633e0
Update submodules on '5.10' in qt5
...
Change-Id: Ic6c5ea39d6233ef0cf95f38b7ed8da5079631aef
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org >
2017-09-29 07:58:57 +00:00
Qt Submodule Update Bot
1643c95635
Update submodules on '5.10' in qt5
...
Change-Id: If4c77fbc983d5ee85655efa8ec46785b5ce2584c
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-09-28 19:02:58 +00:00
Liang Qi
1cfc052b9d
Merge remote-tracking branch 'origin/5.9' into 5.10
...
Conflicts:
coin/platform_configs/qt5.txt
coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh
Change-Id: I16388eb0c2ebaa08e7bb1255711d64647fdad3ac
2017-09-27 10:26:38 +02:00
Qt Submodule Update Bot
36d633f2fd
Update submodules on '5.10' in qt5
...
Change-Id: I1df55eab97f42f44bf68c41bf6e2a0e5f36fe3ae
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org >
2017-09-27 06:47:03 +00:00
Joni Jäntti
0e4d668e35
Add official URL to MinGW Windows 10 provisioning
...
MinGW currently uses only internal URL without backup. Added the
official URL to these scripts with SHA1 checksum verification.
Change-Id: Id9b8a1bf1110201414e9d79c9e713475118ff661
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io >
2017-09-27 06:04:11 +00:00
Qt Submodule Update Bot
214a38f974
Update submodules on '5.10' in qt5
...
Change-Id: I1d4c2064ee31a8adc1a048782824b3d597ea3242
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org >
2017-09-26 09:24:30 +00:00
Simo Fält
0b251bbdc0
Provisioning: Install Python3 development libs to OpenSUSE
...
Those are required to build Pyside#5.9 branch.
Change-Id: I315c72155815d8b6b0b2c5eee4d3922374262c7a
Reviewed-by: Dominik Holland <dominik.holland@pelagicore.com >
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io >
2017-09-26 07:30:25 +00:00
Qt Submodule Update Bot
28ffb0ce8a
Update submodules on '5.9' in qt5
...
Change-Id: I67e1530a32c84d0eb3b9bbb702922a6ae4f20362
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-09-26 06:06:18 +00:00
Heikki Halmet
512f8ff0a2
Change Packaging and iOS builds to macOS 10.12
...
This changes swap packaging and iOS builds
from 10.10 to 10.12
Task-number: QTQAINFRA-1095
Change-Id: I681c0abc29bfeb240dd61f8a95c811d353979013
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io >
2017-09-25 09:10:31 +00:00
Liang Qi
892b1977c5
Merge remote-tracking branch 'origin/5.9' into 5.10
...
Change-Id: I623539ff0e95642bdd58fa3bbac4d1c88afbe519
2017-09-25 08:57:06 +02:00
Qt Submodule Update Bot
90ddfaf35f
Update submodules on '5.10' in qt5
...
Change-Id: I5ef48890ad2a3c87c1dd89bc4ee35f132bd0d967
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org >
2017-09-25 06:09:56 +00:00
Qt Submodule Update Bot
51c2673304
Update submodules on '5.9' in qt5
...
Change-Id: I35d02c6c8d6ce01d10d094302782d81713163ded
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-09-24 19:29:34 +00:00
Qt Submodule Update Bot
ce1627df92
Update submodules on '5.10' in qt5
...
Change-Id: I60fda85bc418ae5d030608184edc242f82d12227
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-09-23 07:27:16 +00:00
Maurice Kalinowski
b77ab20bf0
Provisioning: Update MQTT provisioning
...
MQTT_TEST_BROKER_LOCATION needs to be prepended to .bashrc to avoid not
being evaluated. Furthermore, a previous installation might need to be
removed.
Change-Id: I9edaeb13378aa262b453f816260ade01ba414961
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2017-09-23 05:48:44 +00:00
Liang Qi
04ccf0e8db
Merge remote-tracking branch 'origin/5.6' into 5.9
...
42b502f30660bf
2017-09-22 21:15:52 +02:00
Qt Submodule Update Bot
6c4eb77aa0
Update submodules on '5.9' in qt5
...
Change-Id: If34cf07aad9b4b3a539223dd37c40c799ffb7ba3
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-09-22 12:30:54 +00:00
Liang Qi
d82fe5cacf
Update submodules on '5.10' in qt5
...
Change-Id: If7ecb5f1d09e34878a553b287771a8eed395bfd1
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2017-09-22 08:03:30 +00:00
Qt Submodule Update Bot
804bfd8700
Update submodules on '5.10' in qt5
...
Change-Id: I6fe7831d598a724eb8796e8a8e97a4946f5d6be4
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org >
2017-09-21 12:25:08 +00:00
Qt Submodule Update Bot
5d5a6d3a87
Update submodules on '5.10' in qt5
...
Change-Id: Ic0421ee85440e9f08f805c6f475238bf8820da0f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org >
2017-09-20 05:45:12 +00:00
Joni Jäntti
0c66e761be
provisioning: Windows 10 x64/x86 Vulkan SDK
...
Added provisioning for LunarG Vulkan SDK on Windows 10 x86/x64.
Task-number: QTQAINFRA-1186
Change-Id: Ie6a4d3a9d8b605e4f1301a3045f8165d349f216f
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io >
2017-09-19 06:39:31 +00:00
Simon Hausmann
99af319684
Merge "Merge remote-tracking branch 'origin/5.9' into 5.10" into refs/staging/5.10
2017-09-19 06:39:29 +00:00
Qt Submodule Update Bot
1d965fc599
Update submodules on '5.10' in qt5
...
Change-Id: Ic5c4e7dde129798e0799d74741c69b32c855351f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org >
2017-09-19 04:11:22 +00:00
Simon Hausmann
356b20feed
Merge remote-tracking branch 'origin/5.9' into 5.10
...
Conflicts:
coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh
Change-Id: Icf3d05fa71052b411febe58c287b9a5b014a275f
2017-09-18 13:51:35 +02:00
Qt Submodule Update Bot
c4a807ca85
Update submodules on '5.10' in qt5
...
Change-Id: I08e75951d175003a670987e1f9ea35296bc12d16
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org >
2017-09-18 11:49:50 +00:00
Qt Submodule Update Bot
6dd41c8406
Update submodules on '5.9' in qt5
...
Change-Id: I46cf8a6f861952ceed6a36ae1b2cb7ca2b103fb8
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io >
2017-09-18 10:32:58 +00:00
Qt Submodule Update Bot
f02c2e2fde
Update submodules on '5.10' in qt5
...
Change-Id: Ia67db183b40e1bec41677876f7c8c4c4e69f30d9
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org >
2017-09-17 00:00:57 +00:00
Simon Hausmann
57043fb07b
Clean up QNX patching
...
Get rid of COIN_WEBSERVER_ADDRESS and download the QNX C++11 patches
from ci-files01 instead.
Change-Id: I7c32bfc1e1abef59b1e419e7dcdb73a5b16a895f
Reviewed-by: Simo Fält <simo.falt@qt.io >
2017-09-16 05:35:10 +00:00
Simon Hausmann
b7d9431716
Fix python installation on OpenSuSE 42.3
...
The move was forgotten in commit
dd3d32d13cdominik.holland@pelagicore.com >
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io >
2017-09-16 05:17:48 +00:00
Maurice Kalinowski
fd76acc661
Add mqtt to qtci-linux-openSUSE-42.3-x86_64
...
MQTT provisioning happened concurrently with an OpenSUSE update.
Change-Id: I23a8b632ff82e3900931b58d3d06b9f37bda5998
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2017-09-14 15:04:30 +00:00
Liang Qi
4b0e2f79c1
Update submodules on '5.9' in qt5
...
Change-Id: I352ed23b7e7a025b1e1730f15a5c0ecc60497c52
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-09-13 06:45:03 +00:00
Qt Submodule Update Bot
3e9b7b16c9
Update submodules on '5.10' in qt5
...
Change-Id: I155cd4eccb5b298f93fe36437b9db450d6e23a6d
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-09-13 04:16:14 +00:00
Simon Hausmann
b1c268a8eb
Build examples also on Linux with namespaces
...
With this change we get coverage for namespace related build breakages
in examples of Linux-only modules, such as wayland.
Change-Id: Id9464140059c459a19ce702d6b21a552f8137a2c
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io >
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io >
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io >
2017-09-12 16:20:51 +00:00
Dominik Holland
528580bbcd
Install python3 on all platforms
...
This forward-ports commit a99d3432f76bf5691ca8a5f3f8ed48simon.hausmann@qt.io >
2017-09-12 13:59:10 +00:00
Liang Qi
b6e6882bb7
Update submodules on '5.9' in qt5
...
Change-Id: I9897024607ffd0e320ad56fa8ab1d9d4ceacc6c2
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-09-11 18:46:00 +00:00
Jani Heikkinen
2ef18dac6c
Merge "Merge remote-tracking branch 'origin/5.9' into 5.10" into refs/staging/5.10
2017-09-10 11:16:26 +00:00
Maurice Kalinowski
a1f173fc67
Provisioning: Install paho mqtt broker
...
The paho broker is used for testing the Qt Mqtt module, specifically the
client classes.
Change-Id: I252a337eb0454e871669a467dba2d9a379fb33d5
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io >
2017-09-10 11:16:15 +00:00
Qt Submodule Update Bot
eb89f13583
Update submodules on '5.10' in qt5
...
Change-Id: Ic0236346284e3b30012977f634f52d8aa3851d24
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org >
2017-09-10 00:01:18 +00:00
Simon Hausmann
dd3d32d13c
Merge remote-tracking branch 'origin/5.9' into 5.10
...
Conflicts:
coin/platform_configs/default.txt
coin/platform_configs/qtdeclarative.txt
coin/provisioning/common/InstallPKGFromURL.sh
coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/002-apt.sh
Change-Id: Id174b48e650ed18fbba48b4fc617ee075b0586ec
2017-09-06 10:19:35 +02:00
Tony Sarajärvi
8852587991
Provision openSUSE 42.3 and add to CI
...
Replaces 42.1 that isn't supported anymore by
openSUSE.org.
Task-number: QTQAINFRA-1257
Task-number: QTQAINFRA-1259
Change-Id: I660f812ec27a28d413dc52657985c41d1b8dab01
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io >
2017-09-06 06:13:06 +00:00
Qt Submodule Update Bot
bcd7f921f8
Update submodules on '5.9' in qt5
...
Change-Id: I96537e757b58500804180cb579d4777e6abbfc96
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-09-06 06:13:03 +00:00
Tony Sarajärvi
cc8a7501f3
Swap B2Qt branch to Pyro
...
Task-number: QTQAINFRA-1364
Change-Id: I55906a90e26dccd8d32e686368530f27e46e67fc
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io >
Reviewed-by: Sami Nurmenniemi <sami.nurmenniemi@qt.io >
2017-09-05 15:15:59 +00:00
Konstantin Tokarev
6dfd0c7b38
Use 64-bit host for VS2017 builds of QtWebKit
...
Change-Id: I92bec3662bf39fb5a3572f093af09b2b75bda589
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io >
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru >
2017-09-05 13:46:17 +00:00
Simo Fält
a3f4bf703b
Provisioning: Fix helper function's mktemp in macOS 10.10
...
It seems that macOS 10.10 has a non standard mktemp command. It doesn't
work as expected but prints usage and exit instead.
Change-Id: I37be6eb01474466c2b6bbae4f38876673bd9c295
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io >
2017-09-04 14:23:05 +00:00
Qt Submodule Update Bot
44cf10382c
Update submodules on '5.9' in qt5
...
Change-Id: I8d2a3b3c53ef50f543e69d8824e2ec95939956aa
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-09-02 15:13:05 +00:00
Frederik Gladhorn
8c8be48167
Prefer apt-get over apt in scripts
...
apt explicitly warns that it doesn't have a stable UI, so it shouldn't
be used in scripts. This should have no implications in practice.
Change-Id: Id0bb0d44e73b80a19f6ba4ca1aa4d92c09d10a92
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io >
2017-09-02 05:48:25 +00:00
Tony Sarajärvi
8470310388
Provisioning: Add variables properly in .bashrc
...
If we, in a provisioning script, add $PATH to another
file, that $PATH gets expanded there and now. We need it
written as $PATH to the target file, so that it gets expanded
when the other file is run. Not at the moment of running this
provisioning script.
Change-Id: Ie2c64764f9e0a676307cb3a144162cbc35eb33fb
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2017-09-02 05:48:06 +00:00
Tony Sarajärvi
d1dfb5767f
Swap B2Qt branch to Morty
...
Task-number: QTQAINFRA-1364
Change-Id: I9b114d2cbea60928fac4aa8dec9721099b92f5f6
Reviewed-by: Jake Petroules <jake.petroules@qt.io >
2017-09-02 05:47:47 +00:00
Qt Submodule Update Bot
87df3502a7
Update submodules on '5.10' in qt5
...
Change-Id: Ic754baf143f879f561c4d28c8eae3c8675ef9412
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io >
2017-09-01 19:44:43 +00:00
J-P Nurmi
eb6ce241f0
qtquickcontrols2: recommend qtimageformats
...
The new image-based style in Qt Quick Controls 2 uses WebP for
animations.
Change-Id: I42360fc29fbfdc1d85cab5ef37b57569e5af6901
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io >
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io >
2017-08-31 14:29:01 +00:00
Simon Hausmann
6bf5691ca8
Merge remote-tracking branch 'origin/5.6' into 5.9
...
Conflicts:
coin/provisioning/common/InstallPKGFromURL.sh
coin/provisioning/qtci-linux-RHEL-7.2-x86_64/08-pythondev.sh
coin/provisioning/qtci-linux-RHEL-7.2-x86_64/09-cmake.sh
Change-Id: I87b10d75250eecd5271be201fdf6b1d27cc5a791
2017-08-31 11:25:26 +02:00
Qt Submodule Update Bot
bf09762570
Update submodules on '5.10' in qt5
...
Change-Id: I10ce89cd030062845d72a49266bb077cabd935ea
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io >
2017-08-30 04:21:28 +00:00
Qt Submodule Update Bot
21ecbe1957
Update submodules on '5.9' in qt5
...
Change-Id: I89cafd064580d98afb8c55c82465bc3348652ff3
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-08-29 15:05:35 +00:00
Simon Hausmann
207eb4069b
Fix cmake and python installation on RHEL 7.2 and OpenSuSE 42.1
...
The merge commit 74eb85338449ccf716dcdominik.holland@pelagicore.com >
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io >
Reviewed-by: Simo Fält <simo.falt@qt.io >
2017-08-29 10:23:22 +00:00
Qt Submodule Update Bot
b663966026
Update submodules on '5.9' in qt5
...
Change-Id: I96b67c72364dabaf6bbefbcf561104bbd01ee6b3
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-08-28 17:16:10 +00:00
Qt Submodule Update Bot
be3e818688
Update submodules on '5.9' in qt5
...
Change-Id: Ibf7a0094c2e06fdf7b1f62eaf90d6e4f6c6e1161
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-08-28 04:17:37 +00:00
Oswald Buddenhagen
738509c242
Adjust submodule branches
...
Change-Id: I24415b4ce9d74e9eb83420a55e9036d1b0785a73
2017-08-25 14:59:40 +02:00
Liang Qi
e6da4a6aa5
Update submodules on 'dev' in qt5
...
Change-Id: I7192cbb513f05320c792a29a598b535bcd469d85
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2017-08-25 11:55:17 +00:00
Simon Hausmann
3a000ed41a
Fix target architecture for Boot2Qt declarative tests
...
Amends 7456e028a7sami.nurmenniemi@qt.io >
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2017-08-25 09:08:10 +00:00
Qt Submodule Update Bot
3dc3ceb646
Update submodules on '5.9' in qt5
...
Change-Id: Ia93843e106a111a79740fe9b5a55eb177259dcfe
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-08-25 08:27:15 +00:00
Liang Qi
ebf8aa15e6
Merge remote-tracking branch 'origin/5.9' into dev
...
Conflicts:
.gitmodules
coin/platform_configs/qt5.txt
coin/provisioning/common/system_updates.sh
coin/provisioning/qtci-linux-RHEL-7.2-x86_64/08-pythondev.sh
coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/08-pythondev.sh
coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/freeopcua.sh
coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/freeopcua.sh
coin/provisioning/qtci-macos-10.12-x86_64/020-xcode.sh
Change-Id: Id9c38f3cda85b82fc20fb4a1f2ec71aa18646d94
2017-08-24 09:12:33 +02:00
Alexandru Croitor
dfaabde5dc
Enable developer mode on macOS platforms
...
Previously when a VM user tried to attach lldb to a process via ssh,
lldb would fail with the following error message:
"error: process exited with status -1 (unable to attach)". If this
were done over VNC rather than ssh, the user would instead get a UI
popup to enter a password to allow debugging the process.
When trying to debug an application using Xcode for the first time,
Xcode will offer to enable the so called "Developer Mode" which allows
attaching a debugger without specifying a password every time.
This change enables "Developer Mode", so that every VM user doesn't
have to.
Change-Id: Ie4e473a982c908afd456ac1773bbdaf4ce778094
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io >
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2017-08-24 04:49:06 +00:00
Qt Submodule Update Bot
f1b1f3dc09
Update submodules on '5.9' in qt5
...
Change-Id: I12a0463f0b91624649abe6da4cb745f6c20ed69f
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2017-08-24 04:49:02 +00:00
Simo Fält
9d65cd5ca5
Provisioning: Install libclang and its dependencies to macos 10.12
...
Libs and llvm-config is required by pyside. In order to extract
libclang package, we need to install 7zip. 7zip is installed
with homebrew.
Change-Id: I35367dca1f79dbc9e2f1513480f6fc9bb69730d3
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2017-08-23 05:50:26 +00:00
Liang Qi
74eb853384
Merge remote-tracking branch 'origin/5.6' into 5.9
...
Move the Documentation feature to the corresponding Ubuntu 16.04, where
the CI would have used it by magic.
Conflicts:
coin/platform_configs/default.txt
coin/platform_configs/qt5.txt
Done-with: Frederik Gladhorn<frederik.gladhorn@qt.io >
Change-Id: I885ce572710480cd15ecdc8cfac7edb52957f92a
2017-08-22 08:22:02 +02:00
Kari Oikarinen
c2493f9d6d
Use libusb compiled with MSVC 2015
...
QDB has to change to using Windows 10 for releases, because Windows 8.1
is no longer available for non-qt5 builds as a packaging platform in 5.9
branch.
Don't provision libusb on earlier Windows versions, since they don't
have a compatible compiler.
Change-Id: I771a24fcf208c4961483a39e51cb7d95f004ed55
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io >
2017-08-21 17:49:27 +00:00
Sami Nurmenniemi
79db6fc856
Do not use font files from boot2qt toolchain
...
Previously font configuration files were used from the host system.
Updating the toolchain to Morty introduces Cantarell font which
causes toolchain fonts to be used by Qemu. This change forces
also the actual font files to be used from the host system
regardless of what is in the toolchain.
Task-number: QTBUG-62528
Change-Id: I00de0baa952c9b898edc6b9da8d1d8814f6c722b
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io >
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2017-08-21 09:39:57 +00:00
Frederik Gladhorn
896bb94c74
Remove outdated provisioning scripts
...
Ubuntu 14.04 and OS X 10.8 are no longer relevant
Change-Id: Ib18dda605501fbbf2a6cac578a1b34d82102fae4
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io >
2017-08-19 14:51:39 +00:00
Simo Fält
629e24b979
Provisioning: Install libclang to OpenSUSE
...
The script will install custom package, which is known
to match with pyside requirements.
Change-Id: I28ff7877ef1bba50f8d32007af87e70c0ddc398a
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io >
2017-08-17 19:52:48 +00:00
Simo Fält
62c6676f87
Provisioning: Install pip for macOS 10.12
...
Pip is required to provision python packages.
Change-Id: I73ab7556bb6b9ccc57ef078f422bfbba4bfed6a7
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2017-08-17 19:52:41 +00:00
Simo Fält
3690fe06a4
Provisioning: Update CMake on osx 10.10
...
Pyside requires cmake 3.1.0 or more recent.
Change-Id: Ic376d5e5af9f9b0692a2de7c4ec35e6c8bfa9465
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2017-08-17 19:52:35 +00:00
Tony Sarajärvi
f238362a4b
Provisioning: move installing Android NDK and SDK back in line
...
Installing the NDK and SDK takes a lot of time and finding potential
other problems require us to first download the entire Android SDK.
By moving it back in line, we first make sure the other stuff work
before taking care of this.
Change-Id: Ibae82dca247c8ae063548dbafa5a348102bf8ddb
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2017-08-17 19:52:29 +00:00
Tony Sarajärvi
7db6a1cd0f
Provisioning: Reduce verbosity of uncompressing Xcode
...
Change-Id: Id09ace3fcdf53c3b6921ed277c9fe571b5c43e3b
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2017-08-17 19:52:24 +00:00
Simo Fält
c9f842af84
Provisioning: Install virtualenv for macOS 10.12
...
Python virtualenv command is used when building pyside modules,
which installs additional Python modules during build time
and requires access to installation directories.
Change-Id: Id34ac8b36710ba04d8db263acdaf2bd31e314de8
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2017-08-17 19:52:18 +00:00
Kari Oikarinen
1720ed0b6f
Adapt comments to qdb repository move
...
Change-Id: I3ecdc952d1323a14471cdc87b6854b857d4297a7
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2017-08-16 18:57:26 +00:00
Kari Oikarinen
890a478e07
Update libusb version
...
Use an unreleased version that does not have a crash on Windows 7, since
there is not yet an official release that would include the fix.
Task-number: QTBUG-62430
Change-Id: I14d83d01fe3d4b0bfebe7514fbec7d25e99af731
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2017-08-16 18:57:15 +00:00
Simon Hausmann
5a0dc401fa
Remove QtWebKit and QtWebKit examples from Qt 5
...
They are subject to a separate release.
Change-Id: I5ef12b2bbe299da4838be7681e074b70da798262
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru >
2017-08-15 19:01:35 +00:00
Qt Submodule Update Bot
d5967be094
Update submodules on '5.9' in qt5
...
Change-Id: Ia834fffa1951ba804dbf76af3d62652b17d947db
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2017-08-15 19:01:28 +00:00
Harald Vistnes
830f8ac7f2
Make Qt3D depend on qtbase and optionally on qtdeclarative
...
This change will make the pure C++ libs of Qt3D be built even if
qtdeclarative is skipped.
Task-number: QTBUG-62256
Change-Id: I0cdf19a57d1d8eca065e19a21e88193c5dcb5eb6
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com >
Reviewed-by: Sean Harmer <sean.harmer@kdab.com >
2017-08-02 05:30:16 +00:00
Tony Sarajärvi
36d7e7a8da
Update Xcode to 8.3.3 in macOS 10.12
...
Change-Id: I990d2ac89044a5afc6170da9f5c22bc144021036
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
Reviewed-by: Jake Petroules <jake.petroules@qt.io >
2017-07-31 20:16:46 +00:00
Qt Submodule Update Bot
d18d7aaa40
Update submodules on 'dev' in qt5
...
Change-Id: Ic68d5b4cc41971eb619f2ba32097612aa20df3b1
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2017-07-29 05:44:26 +00:00
Paolo Angelelli
74fa40d978
Replace QNX7 target with QNX6.6 for all Qt modules
...
Reason being that it's much easier to trigger compile errors with the
QNX6.6 toolchain than with the newer QNX7, so these show up at once
and not only at qt5.git integration.
Task-number: QTBUG-62047
Change-Id: Ib45728c92488206dbede019e4583bc9a5386b90f
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2017-07-26 14:11:29 +00:00
Simon Hausmann
b229f6d1ea
Merge remote-tracking branch 'origin/5.9' into dev
...
Change-Id: I2d5232e2c3a7a8e0d90183b0448ba0ddb5351a29
2017-07-26 15:34:03 +02:00
Maurice Kalinowski
42a802efba
Update freeopcua version
...
And also moved to Ubuntu 16.04 as we're not testing 14 anymore.
Change-Id: I3fd12a1ff290e564f15a557da33ce3c0008b4f81
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2017-07-26 07:45:00 +00:00
Simon Hausmann
f56f2c20c4
Merge remote-tracking branch 'origin/5.6' into 5.9
...
Conflicts:
coin/platform_configs/default.txt
This also reverts c9d5341307
2017-07-19 13:24:43 +02:00
Jędrzej Nowacki
8b9a8c489f
Use updated Ubuntu 16.04 in CI
...
The system packages in the base template were
updated via apt-get on 12.07.2017.
We hoped that it will solve mysterious problem of
a network interface being randomly disabled. Sadly
we had no luck, but getting all security updates
also make sense.
Change-Id: Id11eead39cf1c8a04c054c19b323f752e797fd12
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2017-07-18 11:44:27 +00:00
Liang Qi
65eb6e74f8
Update qtwebengine and qt3d only
...
Task-number: QTBUG-61693
Task-number: QTBUG-61983
Change-Id: I703ea440ae1b572ae97c4c6616f63b5524718931
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2017-07-18 04:16:45 +00:00
Simon Hausmann
d615b4a99f
Merge remote-tracking branch 'origin/5.9' into dev
...
Conflicts:
.gitmodules
coin/platform_configs/qt5.txt
Remove QNX Windows builds, 0358b6d2liang.qi@qt.io >
Change-Id: I5a56633d6cd60b5514828060fde87f784e54cdda
2017-07-14 07:24:32 +00:00
Friedemann Kleint
1bdbe06c82
MSVC: Run tests with MSVC2017 instead of MSVC2013
...
It appears tests compiled with MSVC2013/64bit are prone to
crashes. Keep only a developer build/compile test in default.txt
and move the packacking builds to qt5.txt with tests disabled.
Enable testing with MSVC2017 builds in qt5.txt.
Task-number: QTBUG-58654
Task-number: QTBUG-50835
Change-Id: I6061fe3a585c4bb94100d73d04434aca42c82608
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2017-07-11 03:30:44 +00:00
Qt Submodule Update Bot
f8d8257579
Update submodules on '5.9' in qt5
...
Change-Id: I113ebb2db59a55786929361437a17536a0131676
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2017-07-11 03:30:38 +00:00
Qt Submodule Update Bot
70c5a5bb97
Update submodules on '5.9' in qt5
...
Change-Id: I3ab9f3aa74c97094076a9c385a152d1af7b6a876
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-07-10 05:11:16 +00:00
Konstantin Tokarev
bbf18ab4ad
Add Packaging configs for VS2017 and MinGW to stand-alone QtWebKit builds
...
Change-Id: I6a51f733d310d8542b184e813f49f1500666d6ee
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2017-07-09 04:51:56 +00:00
Konstantin Tokarev
dd5096c6c7
Conan: update ICU to 59.1, added VS2017 packages
...
MinGW packages will be upgraded in another patch.
Task-number: QTBUG-61728
Change-Id: Ie6a1996b7850282a7cdcbe5ceba61f1ce473cf69
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2017-07-09 04:51:54 +00:00
Konstantin Tokarev
6837a847bb
Provisioning: install x86 conan packages on MSVC2015-x86_64 Win 10 host
...
Also upgrade to Conan 0.24.0.
Task-number: QTBUG-61829
Change-Id: Ia01609e5f2d8121eb216b03bc8e95bca7225042e
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2017-07-09 04:51:51 +00:00
Konstantin Tokarev
a96119c121
Provisioning: move Conan manifests to common directory
...
We need to use x86 packages from qtci-windows-10-x86_64 configuration,
so splitting Conan manifests by configuration is not a good idea anymore.
Task-number: QTBUG-61829
Change-Id: I8b2fc00865cce372ca6b5ec75b4775d345d0d18f
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2017-07-09 04:51:48 +00:00
Simo Fält
5f37f812f9
Provision homebrew
...
Some of the macOS templates are cleaner than others and are mising some
basic tools like 7z. Homebrew provides easy way to install wide range of
tools via command line.
Change-Id: I5a8528bb4a13ef9a72e2467c51a8b5d45f9a3d84
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2017-07-08 07:23:16 +00:00
Simo Fält
0001d102f8
Provision libclang
...
PySide versions following 5.6 use a C++ parser based on Clang.
The Clang library (C-bindings), version 3.9 or higher is
required for building.
Change-Id: Ia7bcad46e3214d6d8b688354c9abdc83a513573c
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2017-07-08 07:23:09 +00:00
Simo Fält
577140a728
Provision 7z
...
macOS 10.11 tier1 template is missing 7z.
Change-Id: I9e1ade8605b5e6f389a2cd76340070070a7c637b
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2017-07-08 07:23:03 +00:00
Qt Submodule Update Bot
2f03b7faac
Update submodules on '5.9' in qt5
...
Change-Id: I15484289efb35a8b8763379466c884f32f2f9cf9
Reviewed-by: Simo Fält <simo.falt@qt.io >
2017-07-08 07:22:54 +00:00
Liang Qi
bded0e1bbc
Update qtqa only
...
Change-Id: I326c5a081af3bdd5e11aff5316c604a64db94a97
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-07-07 22:02:45 +00:00
Liang Qi
cdbccd5a12
Update submodules on 'dev' in qt5
...
Change-Id: I3aca18dc902cd9499c5977e606cd256082144695
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-07-07 21:33:24 +00:00
Liang Qi
82bdc55bc3
Update submodules on 'dev' in qt5
...
Change-Id: I0c3b28b0ecfefca4211f4944a059e383173415d8
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-07-06 06:17:22 +00:00
Qt Submodule Update Bot
3c1f21253d
Update submodules on '5.9' in qt5
...
Change-Id: I611bb70dfb5a51adfce657491820735f13aec274
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2017-07-06 05:43:30 +00:00
Liang Qi
e70352fdf7
Merge remote-tracking branch 'origin/5.9.1' into 5.9
...
Change-Id: I45fa799354b107ba95b55063f6b81f4dca4b8bb5
2017-07-04 14:18:30 +02:00
Liang Qi
cc549c2444
Update qtqa only
...
Change-Id: I6ef90bb4ce03188a3bcc6e22bbf1e9204e763690
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-07-04 11:51:53 +00:00
Qt Submodule Update Bot
6711742b8c
Update submodules on '5.9' in qt5
...
Change-Id: I599d90ba87636b0e738d2263ddfd036f458ae8fe
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-07-04 05:05:41 +00:00
Liang Qi
744634e97f
Update qtwebkit only
...
Change-Id: I767b48af8cf41355cc984f8d884b1bc042cae4bf
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-07-03 18:04:50 +00:00
Konstantin Tokarev
331cf52ff7
Provisioning: Install Ninja on windows hosts used to build cmake-based QtWebKit
...
Makefile-based generators of CMake are much less efficient than Ninja. They
generate bloated Makefiles that call back to cmake often. Main offender on
Windows is cmake_depends command which seems to do lots of disk reads.
QtWebKit can now switch to ninja automatically if it's present in PATH.
This should help to reduce build times.
Change-Id: I33d3f4d766a630f8ca4fb64b719fe2e8a5c2e00c
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2017-07-03 07:22:38 +00:00
Jani Heikkinen
f3a2e06e60
Switch qtspeech & qtnetworkauth from tp to addon
...
qtspeech and qtnetworkauth aren't technology preview modules anymore
from Qt 5.10 ->
Task-number: QTBUG-61436
Change-Id: I1a88f554498461a81ee80f435fccad7d0e542abf
Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io >
Reviewed-by: Jesus Fernandez <Jesus.Fernandez@qt.io >
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io >
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io >
2017-06-29 21:16:52 +00:00
Liang Qi
69188e280c
Update submodules on 'dev' in qt5
...
Change-Id: I40a221e14a1d308619e1e382b08ae16240b81ead
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-06-29 21:16:49 +00:00
Qt Submodule Update Bot
477736dff0
Update submodules on '5.9' in qt5
...
Change-Id: Ia1e8d5681b65e37882b61f1a00f9f6acc88f81b9
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-06-29 10:13:23 +00:00
Qt Submodule Update Bot
d07943b322
Update submodules on '5.9.1' in qt5
...
Change-Id: I4d1313a38b7f2296db43badf8e8906be9fa6b3d3
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-06-28 19:36:22 +00:00
Jesus Fernandez
e6d42ad390
Add qtwebglplugin
...
Task-number: QTBUG-61443
Change-Id: I0a139c68c41cfa11d110fab1d7c97276c4d022a0
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io >
2017-06-28 15:34:08 +00:00
Liang Qi
b99923d6ee
Update qtdeclarative only
...
Change-Id: Id092226dfa273fff8459b6a256ce5e5e87c364ed
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-06-26 22:27:57 +00:00
Dominik Holland
1859f9b26c
Download and install vc_redist 2015 on windows 7 and 8
...
This is a dependency of the python3 packages for windows
Change-Id: I6f45dcb1d64f43dedd883d33fdc85038c24fc501
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2017-06-26 08:12:40 +00:00
Qt Submodule Update Bot
27761dc945
Update submodules on '5.9' in qt5
...
Change-Id: Ic665ad45eee9ee847438921bc663e9374c94a59b
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-06-25 08:05:18 +00:00
Liang Qi
22522f5190
Update submodules on '5.9' in qt5
...
Change-Id: I228229c5b9afaa6e3a34ba33d7b3cbcc17695629
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-06-24 19:58:06 +00:00
Qt Submodule Update Bot
0f33bbfccc
Update submodules on '5.9.1' in qt5
...
Change-Id: Iab5c3a27dbaab7804978afb0bde341155903c141
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io >
2017-06-24 09:15:35 +00:00
Simon Hausmann
8318aa7f13
Fix builds with examples and namespaces and tests in qtbase
...
Manually bump declarative include a sha1 that'll unbreak the build.
Also bump qtbase to latest 5.9.1 to include the blacklisting of
tst_qudpsocket::linkLocalIPv6.
Change-Id: If5739bc170bc7f2e45d8c5e785bcad6eb15fddcd
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2017-06-23 06:08:55 +00:00
Oswald Buddenhagen
3dfaaaa804
Merge remote-tracking branch 'origin/5.9' into 5.9.1
...
Change-Id: I4cd60a86dc6538d94163702e9635a58157c599b6
2017-06-19 08:25:51 +02:00
Qt Submodule Update Bot
d4393574f3
Update submodules on '5.9' in qt5
...
Change-Id: Idfe407e44ed4a659615a711c34570cd99096a502
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-06-18 19:56:02 +00:00
Liang Qi
9781ab9119
Update submodules on '5.9' in qt5
...
Change-Id: If5a5489690a896422cdc183b520635675d76118b
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-06-17 22:04:40 +00:00
Tony Sarajärvi
0dd6023684
Remove provisioning scripts for platforms not supported anymore
...
Change-Id: I8c3685aaf51005f58ba84f695879f82e32a4f689
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2017-06-14 07:43:39 +00:00
Qt Submodule Update Bot
90cee99617
Update submodules on '5.9' in qt5
...
Change-Id: Ibea2cde30fc92cc089622379068af09e453d8504
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2017-06-14 07:42:56 +00:00
Tony Sarajärvi
52bfe2a9a8
Enable autotest for macOS 10.12
...
Task-number: QTQAINFRA-1093
Change-Id: I21e715b10593d0a9c55b2324c6af8e4bffca0b72
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io >
2017-06-14 07:42:53 +00:00
Dominik Holland
a765838889
Fix the python3 packages on openSUSE 42.1
...
Change-Id: Ie445949ac90bf6a9ce7b519bbe3c32d2d1e1a69b
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2017-06-13 16:39:12 +00:00
Simon Hausmann
20113e4872
Merge remote-tracking branch 'origin/5.6' into 5.9
...
Conflicts:
coin/platform_configs/default.txt
coin/platform_configs/qt5.txt
Change-Id: I1709ddd14bf27186a8968ce073cf22e7903ff798
2017-06-12 21:36:03 +02:00
Kai Koehne
9b0e908aca
Build examples with MSVC 2015 instead of MSVC 2013
...
Qt WebEngine does not build with MSVC 2013 anymore, hence the examples
from this module weren't tested at all.
The 2015 configuration also places the Qt symbols in a namespace, so
this adds additional coverage.
Change-Id: I395866e8435fbcba33a1b3b4a4a5ccfe82ebad15
Task-number: QTQAINFRA-1271
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2017-06-12 18:19:22 +00:00
Friedemann Kleint
eb58b173e1
Enforce MinGW developer build
...
MinGW is very sensitive to inlining / export errors, so having a
developer build check is valuable. Add a MinGW developer build
executing tests to increase coverage and turn off testing for the
packaging build in return.
Change-Id: Ia4bdacc9952c7a568ac9d4105818eb926c88e6ca
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2017-06-12 18:19:13 +00:00
Qt Submodule Update Bot
967ba102f3
Update submodules on '5.9' in qt5
...
Change-Id: I2cfafe4529e2eb9f3c18bdc79365f0f306d42891
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2017-06-12 18:19:06 +00:00
Oswald Buddenhagen
9bb17a6f88
Adjust submodule branches
...
Change-Id: Ib2a7d9a96a8c992527db170276cd0e34b85d1dc2
2017-06-12 12:32:53 +02:00
Oliver Wolff
0787472145
Add winrtrunner to common tools on Windows 10 machines
...
winrtrunner is needed for running auto tests on winrt. As the tool
resides in qttools and not qtbase and it not changed often, it was
decided to handle it similar to jom and see it as an external tool.
Change-Id: I9636962df51f98bef6aad3e340c565f50e393949
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2017-06-12 05:43:15 +00:00
Qt Submodule Update Bot
026f813fcb
Update submodules on 'dev' in qt5
...
Change-Id: I23fe8d00027c73dd5ea774589853a4e22c70e402
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-06-12 05:43:12 +00:00
Sami Nurmenniemi
7456e028a7
Enable CI tests for Boot2Qt
...
Task-number: QTBUG-60261
Change-Id: I296cf7f9afc15aebf1d2006c51023cb6ac3b0c3b
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2017-06-09 05:43:48 +00:00
Qt Submodule Update Bot
9101ac782f
Update submodules on 'dev' in qt5
...
Change-Id: I5f4b2743d35576c0b6df2ee62ec404d337974c3c
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-06-07 05:06:50 +00:00
Liang Qi
9bb96b31a0
Update submodules on '5.9' in qt5
...
Change-Id: Ie82dec6200b3b2a9633feb2dabec9ac27afbcaf8
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-06-07 05:05:03 +00:00
Tony Sarajärvi
ba1a8d6216
Provision macOS disable screensaver in current session
...
Task-number: QTQAINFRA-1244
Change-Id: I3a27d8cdee8cd7b22d86116d58009e952ab536ea
Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io >
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2017-06-05 03:32:31 +00:00
Jani Heikkinen
5be9b3d2be
Add missing ForceDebugInfo -flag for winRT x86_64 builds
...
Task-number: QTQAINFRA-1233
Change-Id: I5fadf9a71e5835b852849fbee1f7021864044f25
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io >
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io >
2017-06-04 19:55:21 +00:00
Akseli Salovaara
8df3b0c7ea
Build Windows 10 MSVC2015 x86 on Windows 10 x64 host
...
Changing MSVC 2015 integration host from 32 bit to 64 bit machine
enables CI for QtWebEngine 32 bit Windows builds.
Change-Id: I3d30df90fa7d92c603a2e91dd528d817e682c214
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io >
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2017-06-04 19:55:18 +00:00
Thiago Macieira
60fb73a1eb
qtremoteobjects has QML plugins
...
Change-Id: Ia3e896da908f42939148fffd14c47ef303f5d0e7
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
Reviewed-by: Brett Stottlemyer <bstottle@ford.com >
2017-06-04 17:03:03 +00:00
Qt Submodule Update Bot
38ae7edf69
Update submodules on 'dev' in qt5
...
Change-Id: Ib7ce19810c0daa4c0cf39198c580dc6baa22c74a
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-06-04 08:52:58 +00:00
Qt Submodule Update Bot
eeb1a20326
Update submodules on 'dev' in qt5
...
Change-Id: I3a885b5f914584fa259fbd94553e8f03fb160573
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-05-30 05:51:44 +00:00
Liang Qi
1f15ce005f
Merge remote-tracking branch 'origin/5.9.0' into 5.9
...
Conflicts:
.gitmodules
Change-Id: Ifa5edde4cfd68df959fabb6a61595d8c1b28b099
2017-05-26 10:29:43 +02:00
Jason Erb
613242b2bf
Add *.pro.user* to .gitignore
...
Task-number: QTBUG-60767
Change-Id: Id81504b35dc8d3ef7eba6ada5baaefe5e6d9f106
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io >
Reviewed-by: Mandeep Sandhu <mandeepsandhu.chd@gmail.com >
2017-05-25 21:34:29 +00:00
Oswald Buddenhagen
5236e08cd4
make -skip work with configure -redo
...
the handling of -skip happens outside the usual argument handling, so we
need to handle -redo manually as well.
Change-Id: I7dcdf729bd9db2ff2ac8dc08bac71462bf30814b
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io >
2017-05-25 21:34:26 +00:00
Qt Submodule Update Bot
a7dae7420d
Update submodules on '5.9' in qt5
...
Change-Id: I2fd0c63e8b891b8595104f9f2745d62e520f340a
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-05-25 21:34:23 +00:00
Liang Qi
cf6eb6f9ef
Update submodules on '5.9' in qt5
...
Change-Id: I3cfe11ad0b5065f90cf57a98218af308a8906bba
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-05-23 12:59:30 +00:00
Qt Submodule Update Bot
4d6b04db3c
Update submodules on '5.9.0' in qt5
...
Change-Id: I4b682b41b9d42a95c9d7837a0c9d2a5cd1b16d0a
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2017-05-22 20:36:56 +00:00
Qt Submodule Update Bot
d2430f9e6f
Update submodules on '5.9.0' in qt5
...
Change-Id: I59a75557095d67dad5cf36f78fb86eb17cd05513
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-05-20 19:22:51 +00:00
Liang Qi
90e14cf194
Update qtlocation manually
...
Change-Id: Ief99f6b991ea0fbfc2c0d019b68835db36539587
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-05-19 15:31:00 +00:00
Qt Submodule Update Bot
9b9b3817b1
Update submodules on '5.9.0' in qt5
...
Change-Id: Ifc375a6978c7d8fc89396b7bfbebb18f90d59b37
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io >
2017-05-19 03:48:11 +00:00
Heikki Halmet
d514585213
Enable WinRT builds for MSVC 2017
...
All 2017 configurations are added to qt5.txt for now.
Change-Id: I4745c61a99891e2fc6d8b381b4aa831150fb4596
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io >
2017-05-11 12:16:23 +00:00
Dominik Holland
a5f3f8ed48
Install python3 on all platforms
...
Task-number: QTAUTO-345
Change-Id: If11ca425fa08cce8a518710ded0a6ec58159343d
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2017-05-11 10:29:12 +00:00
Liang Qi
41379a50c7
Merge remote-tracking branch 'origin/5.6' into 5.9.0
...
Conflicts:
coin/platform_configs/default.txt
coin/platform_configs/qt5.txt
Change-Id: Id82a13a6b2fe6db60c286e470396298c08e363b8
2017-05-08 08:35:30 +02:00
Qt Submodule Update Bot
f5754fd722
Update submodules on '5.9.0' in qt5
...
Change-Id: I4d592c4749ad4ddd8a54ce186ae89682a564a5ba
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-05-07 18:36:31 +00:00
Qt Submodule Update Bot
eb362e7bc8
Update submodules on '5.9' in qt5
...
Change-Id: Ieb47df20d8495f0dd6f726645330dcb9542cf96d
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-05-07 09:17:17 +00:00
Qt Submodule Update Bot
73a9754842
Update submodules on '5.9.0' in qt5
...
Change-Id: I3d17d880ce8a5ef4180cdbfb163df8d4f07a0398
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-05-06 17:32:39 +00:00
Jake Petroules
d48b0c3402
Remove Static from the tvOS configuration
...
This further helps with the shared library coverage on iOS-like
platforms as iOS and tvOS are nearly identical, until such time iOS can
be moved to shared libraries for official releases as well.
Change-Id: I7dbc448890759a4e49a242d4c5bcb00f6c673f4e
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org >
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2017-05-06 09:18:10 +00:00
Oswald Buddenhagen
8d2f6c17f9
Merge remote-tracking branch 'origin/5.9' into 5.9.0
...
Conflicts:
.gitmodules
Change-Id: I5b4d96eedbbc228d61d7c62ff077c05a4fb70928
2017-05-05 11:22:54 +02:00
Jake Petroules
dfb0befca3
Remove Static from the watchOS configuration
...
This was unintentionally added, and helps with the shared library
coverage on iOS-like platforms until such time iOS and tvOS can be moved
to shared libraries for official releases as well.
Change-Id: Iabae0503a0ce3fe538b97fc1941a1ccf19024429
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org >
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2017-05-05 06:12:36 +00:00
Tony Sarajärvi
4f4de8aa16
Change OS X 10.11 to run tests instead of 10.10
...
This commit removes OS X 10.10 as a developer build
target, and enables autotests on osx 10.11 developer build.
Task-number: QTQAINFRA-1090
Change-Id: I0ba0a60edd7010eedd3289c400266b4cced6c133
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2017-05-05 04:34:47 +00:00
Tony Sarajärvi
7937eb2d9e
Provisioning: disable screensaver password
...
Previously provisioning disabled screensaver on startup
but didn't affect current session. Thus the screensaver
hits the VMs while provisioning and without this commit
the screen gets locked. This prevents the lock and
we get to the desktop on the VMs.
Change-Id: Icd783127e898ece6bebb5598ab86f12d5062eeb5
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2017-05-04 17:37:00 +00:00
Tasuku Suzuki
933688fc39
Change qt3d dependency on qtimageformats to optional
...
only examples use webp from qtimageformats.
Change-Id: I6fb0f21800761b9ddaaf55e250cdd8926800aac7
Reviewed-by: Sean Harmer <sean.harmer@kdab.com >
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io >
2017-05-04 17:36:51 +00:00
Qt Submodule Update Bot
c1dd36f4d1
Update submodules on '5.9' in qt5
...
qttools manually updated to include compile fix.
Change-Id: I4cee5023ab7c33f96ff509500b1b9db53daeaee6
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2017-05-04 17:36:44 +00:00
Qt Submodule Update Bot
596702c398
Update submodules on 'dev' in qt5
...
Change-Id: Ia5664a1fa14008265e4df4b4937d6f1de96c30c9
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-05-04 05:44:15 +00:00
Qt Submodule Update Bot
76ea20881e
Update submodules on 'dev' in qt5
...
Change-Id: I8b9a5e7630127bc423854ec2d680a51e779b2db3
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-05-03 10:10:56 +00:00
Oswald Buddenhagen
40b07da194
make sure that all submodule urls end in .git
...
http(s) needs that.
Started-by: Alvaro Denis <denisacostaq@gmail.com >
Change-Id: I1373191d17586eae67bc49c3a83d1dc32b59f988
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io >
2017-05-02 17:16:25 +00:00
Simon Hausmann
4ee0e8fb46
Fix tier1 template selection for QNX 7 builds on Windows
...
Use the latest windows 10 template, not something outdated.
Amends e3e30b4a2b070d9333a6heikki.halmet@qt.io >
2017-05-02 17:16:22 +00:00
Heikki Halmet
385ecebe80
Platform Configurations for Visual Studio 2017
...
MSVC 2017 is pre-provisioned to tier 1 template with MSVC 2017 build
tools. When winrt arm is available for msvc 2017 in qtbase it will
be added to platform configurations also
Change-Id: Ib33cd63a974683de080bf5734081a73ecb1dabeb
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2017-05-02 17:16:19 +00:00
Qt Submodule Update Bot
5af86c74b2
Update submodules on '5.9' in qt5
...
Change-Id: I6aed41bf25a3230d2c6643dea89033ad66543c91
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-05-02 05:09:20 +00:00
Simo Fält
e3e30b4a2b
Provision toolchains and take QNX 7 SDP into use with 64 bit Win10
...
Task-number: QTQAINFRA-1113
Change-Id: I7151dc89c6813ad6c37fde20b8aa641578c54d4c
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2017-04-30 06:47:27 +00:00
Qt Submodule Update Bot
ed7ceee87d
Update submodules on '5.9' in qt5
...
Change-Id: I3b16919a9c1e93e955fd9d5e3f3a8f699fa914a5
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2017-04-29 19:47:21 +00:00
Qt Submodule Update Bot
f436db11bb
Update submodules on '5.9' in qt5
...
Change-Id: Id118e3a91f3ac21c01823227a17075a208202bdd
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-04-28 11:48:42 +00:00
Oswald Buddenhagen
8325f2bde9
Adjust submodule branches
...
Change-Id: I6989e17a9b33cf69863ce80fb1b1011d2223f951
2017-04-27 12:34:03 +02:00
Simo Fält
e0764f873b
Provision and take QNX 7 SDP into use with RHEL 7.2
...
After enabling QNX 7, we are moving some QNX 6.6 config
to be ran with qt5 integration only.
Task-number: QTQAINFRA-1111
Change-Id: I230b5f8b8631558ccfa156ae4f949ed045c40972
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io >
2017-04-27 10:25:59 +00:00
Sami Nurmenniemi
94e22fcd94
Add preparing of qemu fontconfig to Ubuntu 16.04 provisioning
...
If normal fontconfig paths are used, qemu parses what ever files it finds from
the toolchain sysroot and the rest from the system fonts. Fix by copying the
system font configurations to a location which prefix that can't be found from
the toolchain sysroot. Links must also be dereferenced or their targets remain
pointing to the toolchain sysroot.
Task-number: QTBUG-59966
Change-Id: I9710c9fdebe81114080f47f1f59b2a049f87c070
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io >
2017-04-27 10:25:56 +00:00
Tony Sarajärvi
ed39e440a9
Provision environment variables for SSL autotests
...
Task-number: QTBUG-56102
Change-Id: I7f14fbebcc459b4610ca9469b4335ef5b18ba5b4
Reviewed-by: Jake Petroules <jake.petroules@qt.io >
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io >
2017-04-27 10:25:52 +00:00
Tony Sarajärvi
fb67cd8ef0
Provision: Remove excess export that wasn't read in Ubuntus
...
Default shell for 'qt' user is Dash. It doesn't read .bashrc
at all. Coin uses bash, but uses it non-interactively which
in .bashrc means that it bails out immediately. So same result,
.bashrc isn't read in Ubuntus.
Change-Id: Id466c86f8cc813aacd5f41c4b267b44e93759377
Reviewed-by: Sami Nurmenniemi <sami.nurmenniemi@qt.io >
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2017-04-27 10:25:49 +00:00
Miikka Heikkinen
c3d2bd97bf
Add provisioning for qt3dstudio 3rdparty tools
...
Change-Id: I8060b6fd89e4c188d17219f43c8789aa25713068
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2017-04-27 10:25:47 +00:00
Jake Petroules
ddf574fd81
Make Apple tvOS and Apple watchOS configurations available
...
Change-Id: I53b71d04c8cdf68f136a6ca057282c656307919e
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2017-04-25 21:14:41 +00:00
Simon Hausmann
070d9333a6
Merge remote-tracking branch 'origin/5.6' into 5.9
...
Conflicts:
coin/platform_configs/default.txt
coin/platform_configs/qt5.txt
coin/provisioning/qtci-osx-10.10-x86_64/android.sh
coin/provisioning/qtci-osx-10.11-x86_64/android.sh
Change-Id: I2c3ae694d05ffe502967595fc7c7cfc6ddae4d4d
2017-04-25 12:37:26 +02:00
Qt Submodule Update Bot
ec5efb6b70
Update submodules on 'dev' in qt5
...
Change-Id: I662d698fcf213f2f5e936827dffafe0605309a31
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-04-25 07:14:38 +00:00
Simon Hausmann
9884a4e98e
Make Java installation independent from the disks in the system
...
Assuming that the JDK dmg will always be mounted via /dev/disk1s1 breaks
when another disk is present in the system and the DMG ends up at disk2
for example.
Change-Id: Ia196a6ae18f455144802167c0887bf18dafbc101
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io >
2017-04-25 04:56:11 +00:00
Liang Qi
69da4dda48
Update submodules on '5.9' in qt5
...
Change-Id: Iad79cef81aba1b694e35465aa590dac529603bc6
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-04-24 14:48:34 +00:00
Liang Qi
e3b940d7e8
Merge remote-tracking branch 'origin/5.8' into 5.9
...
Change-Id: I83b64c83c848a68637e2172a5201e8870c8a6a12
2017-04-21 11:40:18 +02:00
Qt Submodule Update Bot
6366979b15
Update submodules on '5.9' in qt5
...
Change-Id: I34ed33d4cedd7d70ac7c8adfdcfbc1ab459e9dbb
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-04-21 06:22:22 +00:00
Simon Hausmann
ce9181a964
Improve reliability of automated xcode installation
...
Instead of downloading a 4+GB archive and uncompressing it in /tmp,
let's uncompress the archive via NFS and feed the data straight into
cpio. This should be faster and avoids curl's error handling that's
happy to abort instead of re-trying.
Change-Id: Ifa5d842c50111ccdbd56e795b270ee6433a63adf
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io >
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io >
2017-04-21 06:22:10 +00:00
Qt Submodule Update Bot
79bc19fc8e
Update submodules on 'dev' in qt5
...
Change-Id: I0ef28d11ce0ca7d1ba5c67c36748ebf377dc6787
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-04-21 05:06:10 +00:00
Tony Sarajärvi
6b086604c1
Enable INTEGRITY in RHEL 7.2
...
Provision the INTEGRITY SDK and enable the builds
for Qt5 builds.
Task-number: QTBUG-59076
Task-number: QTBUG-59077
Change-Id: I448a16e45312b88eb5f710a600956c076480e253
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2017-04-20 05:20:54 +00:00
Tony Sarajarvi
f2467e5a48
Add java.sh provisioning script for macOS 10.12
...
Required by Android SDK.
Task-number: QTQAINFRA-1094
Change-Id: I4bde075f95c57fbe919ac2a5c09e25107e8525a1
Reviewed-by: Jake Petroules <jake.petroules@qt.io >
2017-04-20 03:30:06 +00:00
Tony Sarajärvi
3d27db23fd
Provision OpenSSL to macOS 10.12
...
Change-Id: I97d811ebbdda69f78bbd5f71ae38847a851a24fe
Reviewed-by: Jake Petroules <jake.petroules@qt.io >
2017-04-20 03:29:57 +00:00
Tony Sarajärvi
e01ac750ac
Build macOS Android builds on macOS 10.12
...
Removes the build targets on macOS 10.10 and 10.11.
Task-number: QTQAINFRA-1176
Change-Id: I668b74b17f48abe108673d93b6a9359dd31ce90e
Reviewed-by: Jake Petroules <jake.petroules@qt.io >
2017-04-20 03:29:45 +00:00
Tony Sarajärvi
9dfab7c1bd
Fix provision script to create sub folders if needed
...
Change-Id: I6bec5e3adb66d0e88f611a83d05a52e6b8858b7a
Reviewed-by: Jake Petroules <jake.petroules@qt.io >
2017-04-20 03:29:36 +00:00
Tony Sarajärvi
79cc848ab8
Provision Android SDK to macOS 10.12
...
Task-number: QTQAINFRA-1094
Change-Id: Ibee4e78979cdaff447c8a9d75024994ebc121572
Reviewed-by: Jake Petroules <jake.petroules@qt.io >
2017-04-20 03:29:23 +00:00
Qt Submodule Update Bot
f19d2c9622
Update submodules on '5.8' in qt5
...
Change-Id: I2dbd8467b77c1a55160396b62bf270d8cdacbb23
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-04-19 11:25:59 +00:00
Qt Submodule Update Bot
04ab94c781
Update submodules on '5.8' in qt5
...
Change-Id: Ib8ef3a21c594b3c58fe8b9f51468b3e5f5b33289
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-04-19 10:23:39 +00:00
Tony Sarajärvi
e5f0b04f12
Update Xcode 8.3.1 to macOS 10.12
...
Change-Id: Ie311d7374b74ce1179f7a8bb981733be016d387f
Reviewed-by: Jake Petroules <jake.petroules@qt.io >
2017-04-18 22:08:33 +00:00
Qt Submodule Update Bot
2c8fbe418c
Update submodules on '5.8' in qt5
...
Change-Id: I4aa51db4cf07e85ed69cb82fd76dae863dd55db4
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-04-18 06:59:49 +00:00
Simon Hausmann
8b4e259b22
Merge remote-tracking branch 'origin/5.9' into dev
...
Change-Id: Iddf09c38c811979458639c759056a032187493de
2017-04-17 18:34:04 +00:00
Simon Hausmann
18999572b4
Update qt3d manually to pull in Ubuntu 16.04 fixes
...
Change-Id: Iddea4ee53f0afd5d1b2a85d190f19e82a87d61ea
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2017-04-17 11:47:41 +00:00
Qt Submodule Update Bot
ada6b66011
Update submodules on '5.9' in qt5
...
Change-Id: Ib3cb8cae3bbdedbaafe1e5deb3c0ca9252f010d3
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2017-04-15 06:55:38 +00:00
Qt Submodule Update Bot
89bd3ce5a7
Update submodules on '5.8' in qt5
...
Change-Id: I330bfe1c5c1eda6a806feef9cc3b930362245fb5
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-04-14 04:20:47 +00:00
Simon Hausmann
fa903eba4b
Merge remote-tracking branch 'origin/5.6' into 5.9
...
Conflicts:
coin/platform_configs/default.txt
coin/platform_configs/qt5.txt
Change-Id: Icee114ea6bd025a54db7ce34d6a0bd0dc16e767c
2017-04-13 21:54:47 +02:00
Qt Submodule Update Bot
bac199faa3
Update submodules on '5.9' in qt5
...
Change-Id: Ice64fb51928fda825b63eef8e09f752c4a67395f
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io >
2017-04-13 12:23:29 +00:00
Konstantin Tokarev
aac3786d67
Add cmake location to PATH when provisioning macOS 10.12
...
Change-Id: I3afecaefced45704b77b461a2bc2869134567a2e
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2017-04-12 08:55:39 +00:00
Qt Submodule Update Bot
2c7db95e7c
Update submodules on '5.8' in qt5
...
Change-Id: I707f07be6b8f9238b4c6f9e79f1a9831e81f785d
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-04-12 05:53:35 +00:00
Qt Submodule Update Bot
4b5af2de68
Update submodules on '5.9' in qt5
...
Change-Id: Id6c112e68c465ae52d49f4b35bee648894a35fef
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-04-11 16:45:57 +00:00
Qt Submodule Update Bot
b0e96ff58f
Update submodules on '5.8' in qt5
...
Change-Id: I6b50e79e45b05ff3a2dc5590a87eeb593b9fa2dc
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-04-11 05:04:18 +00:00
Qt Submodule Update Bot
d353476112
Update submodules on '5.9' in qt5
...
Change-Id: I9c5567a7b76101548b690dee3bba06fcdf11bd36
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-04-10 11:54:11 +00:00
Tony Sarajärvi
bb5139dd09
Enable autotests for Ubuntu 16.04 and swap configs
...
As autotests pass, we can also move all existing
Ubuntu 14.04 configurations to run on a more recent
Ubuntu 16.04.
Task-number: QTQAINFRA-1101
Change-Id: I99c4f674dc48521c66ac579c6bb1b5396c282131
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org >
Reviewed-by: Simo Fält <simo.falt@qt.io >
2017-04-10 05:20:10 +00:00
Liang Qi
415ea08693
Merge remote-tracking branch 'origin/5.9' into dev
...
Change-Id: I88192479624510cb34227f401d9e8b07977f9711
2017-04-09 09:40:45 +02:00
Qt Submodule Update Bot
5e30cba1fd
Update submodules on 'dev' in qt5
...
Change-Id: Ie2ddd1a461354278d4570e0dc98dcf4d339183d3
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-04-08 20:07:26 +00:00
Liang Qi
b80fa7bc4c
Merge remote-tracking branch 'origin/5.6' into 5.9
...
Conflicts:
.gitmodules
qt.pro
Commit ed8f84f1495656b4848e
2017-04-08 19:51:16 +00:00
Qt Submodule Update Bot
703e71840e
Update submodules on 'dev' in qt5
...
Change-Id: Id5c90ac07c171d06f5d4bc06021cbfedad77a5b3
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-04-08 14:06:40 +00:00
Liang Qi
6720096ee0
Merge remote-tracking branch 'origin/5.8' into 5.9
...
Change-Id: I908f38bd8cfcfd481f005a2588df5d3440eac9c5
2017-04-08 16:04:53 +02:00
Konstantin Tokarev
0c7c11ca56
Fix AltUrl of cmake for macOS provisioning
...
Change-Id: I730a65c2fcbea14bd3fe44e01a182f095d96b0ab
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2017-04-07 22:04:06 +00:00
Qt Submodule Update Bot
c0a148bb7d
Update submodules on 'dev' in qt5
...
Change-Id: I82c6dff79747702f65c17b094f2decad3f471cc6
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-04-07 13:06:53 +00:00
Qt Submodule Update Bot
b91aca3ab8
Update submodules on '5.9' in qt5
...
Change-Id: I2ffc93d7195ab1d368a8dec8219be46acf1f74ee
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2017-04-06 17:39:47 +00:00
Simon Hausmann
c675a237f1
Remove special configuration for xmlpatterns
...
Commit 8b13ccf0238aecfe2a01e3a2e6d90620a8b9e516 in coin attempted to
incrementally add OpenSuSE 42.1 support module by module, and various
transitions have lead to this file. Meanwhile commit
aa7531ca7d0e8f92c49a54f11460ece647ef73f1 in coin replaced OpenSuSE 13.01
globally with 42.1 for all modules, so this separate treatment is not
needed anymore.
Change-Id: I0e162a64816f7925a5afd5a79614a1e8843d9b7e
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io >
2017-04-06 14:35:20 +00:00
Qt Submodule Update Bot
04ec42b9e1
Update submodules on '5.8' in qt5
...
Change-Id: I39b5d0e9bddc2f5519cb08ac0b7b538a49a550b4
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-04-06 09:20:26 +00:00
Simon Hausmann
30da853b97
Enable QEMU based ARM testing for qtdeclarative with Boot2Qt
...
The module has been changed to run a sub-set of tests. With that in
place we can enable test execution, providing us with some CI test
coverage for the ARM JIT, for example.
Change-Id: I5b0ad68fcd4fa8fb73f59432b42ccdd9a5b6fd59
Reviewed-by: Sami Nurmenniemi <sami.nurmenniemi@qt.io >
Reviewed-by: Lars Knoll <lars.knoll@qt.io >
2017-04-05 09:34:04 +00:00
Qt Submodule Update Bot
c55903eaa6
Update submodules on '5.9' in qt5
...
Change-Id: I549dc236009aadd78fb163a2a26b2384bb7de9ab
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-04-05 05:27:25 +00:00
Sami Nurmenniemi
e3d84a49c0
Remove fonts-noto-cjk on Ubuntu-16.04-x86_64 provision image
...
First test using QFont fails if fonts-noto-cjk is installed. This
happens because running fontcache for that font takes > 5 mins when
run on QEMU. Running fc-cache doesn't help since host version creates
cache for a wrong architecture and running armv7 fc-cache segfaults
on QEMU.
Change-Id: I6667b29ad4c4cae8d242e3af63defb603a6e6ec7
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2017-04-04 05:06:46 +00:00
Liang Qi
285ee106e7
Merge remote-tracking branch 'origin/5.6' into 5.9
...
Conflicts:
coin/platform_configs/default.txt
coin/platform_configs/qt5.txt
This also fixes the 7Z extraction code to work on the windows 7 x86
installation where 7z is not in the PATH anymore with revision 2. The
fallback code was 64-bit only and needs the null check for ProgramFiles(x86)
along with the fall back to ProgramFiles to locate the 7z executable.
Change-Id: Ifcf014c3a99685c427a62898e1fa83910a4a7247
2017-04-03 12:06:27 +00:00
Qt Submodule Update Bot
25113b3315
Update submodules on 'dev' in qt5
...
Change-Id: If1a1dc0efcd16aa0887622800394d45d11f120cb
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-04-02 06:13:28 +00:00
Qt Submodule Update Bot
df3c9ce7da
Update submodules on '5.8' in qt5
...
Change-Id: I9444728a1fa2c23e65a3f809767509a0854f1e2d
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-04-02 05:13:29 +00:00
Qt Submodule Update Bot
1bb9546b48
Update submodules on '5.8' in qt5
...
Change-Id: I551f0a875c9c16acbcd768994051e85d9fcde47c
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-04-01 20:23:34 +00:00
Liang Qi
95223c7466
Update qtserialbus manually
...
Change-Id: Ic4e1200a5d75e0c7b33fcb43efb27706260e3202
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-04-01 07:28:35 +00:00
Qt Submodule Update Bot
30e0f087d4
Update submodules on '5.9' in qt5
...
Change-Id: I64a699afde6c7444abfad5d0cac19f2d1d332f7f
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-04-01 06:39:12 +00:00
Qt Submodule Update Bot
ddc800b37f
Update submodules on 'dev' in qt5
...
Change-Id: Ic47ce220597dda941335d6e0ea5dab224c900af3
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-03-31 06:37:34 +00:00
Liang Qi
990625d8cb
Update submodules on '5.9' in qt5
...
Change-Id: I7dfea76bca9df8ab4db1be65068ffa46b414ad3d
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-03-30 05:43:35 +00:00
Liang Qi
37e3da674c
Merge remote-tracking branch 'origin/5.9' into dev
...
Change-Id: I370742cb0aa2b362dded7131adb08bc7af44a02b
2017-03-28 10:20:15 +02:00
Liang Qi
bee0c1b12f
Update submodules on '5.9' in qt5
...
Change-Id: Iefd15fd52d2300981820cb1b067f512228100503
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-03-28 04:45:10 +00:00
Liang Qi
1da7bdd25e
Update submodules on 'dev' in qt5
...
Change-Id: I5df7b6ba38a1e641aa8d154d8184a12cbd2f85bd
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-03-23 20:50:56 +00:00
Liang Qi
0b1af0bb2f
Update submodules on '5.8' in qt5
...
Change-Id: Icc31f52cf5a77a4100dfd63acd32e1596ead3dad
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-03-23 11:33:56 +00:00
Liang Qi
8889075b0d
Update submodules on 'dev' in qt5
...
Change-Id: I9ef55bdca766e92281b92011b63ba9781f4db53f
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-03-22 15:30:04 +00:00
Liang Qi
6d8560c63f
Update submodules on '5.9' in qt5
...
Change-Id: Id9f9836551a35fba5ccd12be449f9c4a92acf486
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-03-19 18:46:59 +00:00
Liang Qi
6995b1e85d
Update submodules on '5.8' in qt5
...
Change-Id: Ibf0175771f357c30243b5d309cfb4facc4a6b31b
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-03-19 13:13:06 +00:00
Liang Qi
e193001bca
Update submodules on '5.9' in qt5
...
Change-Id: I210324952a0126cd656344eebee2dbd6a32f6dc1
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-03-18 06:43:06 +00:00
Liang Qi
e9d91a3949
Update submodules on 'dev' in qt5
...
Change-Id: Ie422699479ce2da8c94cde3987a4685348aa7a21
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-03-16 06:20:31 +00:00
Allan Sandfeld Jensen
3e35991013
Install g++-multilib on Ubuntu 16.04 platforms
...
This is needed to cross-build to 32bit x86 which WebEngine needs for
Boot2Qt ARM builds.
Task-number: QTBUG-59504
Change-Id: I9851d97949dc67c6f564cf09443b0a04998b2590
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2017-03-16 06:20:01 +00:00
Tony Sarajärvi
b14198730d
Remove command line tools from macOS 10.11 and 10.12
...
Qt should not require command line tools to be installed.
When they are installed, we can accidentally rely on
on the tools instead of sysroot.
Task-number: QTBUG-58325
Change-Id: I9ad942c6f67e4c1b7348258a9178ab497ee58800
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2017-03-15 13:21:40 +00:00
Liang Qi
e7c6dcdb32
Update submodules on '5.8' in qt5
...
Change-Id: Iac3e9b6581b2bb490c8c58ccf50cd4f14b6651a8
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-03-15 06:46:50 +00:00
Paolo Angelelli
88e87fe7d3
Recommend qtquickcontrols2 for qtlocation
...
The MapViewer example now uses qtquickcontrols2 sliders.
This patch adds the related dependency
Change-Id: I50db8e6355ee02b61dcd7a4230fafc1fd060fe3d
Reviewed-by: Alex Blasche <alexander.blasche@qt.io >
2017-03-14 07:03:14 +00:00
Kari Oikarinen
b037d8f7b1
Provision libusb for 64-bit Windows 8 and 10 as well
...
Amends 380fca84a9fe583e245355f2e36931473665cf0b.
Change-Id: Ia6e1a3bf2465770f55201cd723b329af42984d2b
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io >
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io >
2017-03-14 07:03:11 +00:00
Qt Submodule Update Bot
f7694572d8
Update submodules on '5.9' in qt5
...
Change-Id: Id6e972d67243340551b0cae64619428a8f601f4c
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2017-03-13 08:56:08 +00:00
Simon Hausmann
2d59a20361
Fix network test server setup
...
Use the correct IP address for the network test server that all the
other machines are using as well.
Change-Id: I1ffe4b6f5851bcb06dc2d39265979b799715ec3f
Task-number: QTBUG-59241
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io >
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io >
2017-03-10 06:10:43 +00:00
Liang Qi
ec763635fa
Update submodules on '5.9' in qt5
...
Change-Id: Id75b75b5dff01db70f87c0f72648bd158e6465dd
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2017-03-10 06:10:40 +00:00
Liang Qi
1269f1bc8a
Update submodules on '5.8' in qt5
...
Change-Id: Ic13d3040b541a4b4e9a293885ce49b0b9ba64afa
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-03-08 20:52:45 +00:00
Joerg Bornemann
a5330bb632
Add ForceDebugInfo to MSVC platforms
...
Create release debug information for MSVC configurations for which we
build packages.
Also, for hard-to-reproduce autotest crashes in the CI enabling
ForceDebugInfo is crucial to get a meaningful backtrace.
Task-number: QTBUG-3934
Change-Id: Ie4ea7b9c6aa251a12796621817d8e3411bbed81d
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2017-03-07 21:29:30 +00:00
Liang Qi
87a4180718
Update submodules on '5.9' in qt5
...
Change-Id: Idad0e50dd673356a7ed27d7c7c978ba10229b71a
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-03-07 21:19:31 +00:00
Liang Qi
f65308d371
Merge remote-tracking branch 'origin/5.9' into dev
...
This change also integrated latest dev branch of qtremoteobjects
and qtwebengine.
Conflicts:
.gitmodules
qtremoteobjects
qtwebengine
Change-Id: Ic6f97f43c55bdca5d8ac0481f3bb8a73429657b9
2017-03-07 19:40:36 +01:00
Liang Qi
ad3c519525
Merge remote-tracking branch 'origin/5.8' into 5.9
...
Change-Id: I415772838a8434d00ad4ccebc8b1c4180e85880b
2017-03-04 22:21:23 +01:00
Teemu Holappa
111799abf1
Add qemu user mode binary
...
qemu is used to run unit tests for arm binaries in coin.
Change-Id: I8610b5d7603fa3bcd5cf0f9e83ee38e219b60a85
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io >
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2017-03-03 14:37:46 +00:00
Akseli Salovaara
8de4f42cb6
Provisioning: Upgrade conan version from 0.16.0 to 0.20.2
...
Conan provisioning fails on private Coin instance due to error message
Could not find a version that satisfies the requirement conan==0.16.0
(from versions: 0.15.0, 0.16.1, 0.17.2, 0.18.1, 0.19.3, 0.20.0, 0.20.1,
0.20.2)
No matching distribution found for conan==0.16.0
Upgrading to 0.16.1 resulted warning
"Your conan's client version is deprecated
for the current remote (v0.20.2). Upgrade conan client."
and provisioning failed with "ERROR: All remotes failed"
After upgrade to 0.20.2 conan provisioning script is working again.
Change-Id: I2fe9d65460954c929abb4822d206dde42909d5b3
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru >
2017-03-03 12:26:24 +00:00
Liang Qi
93b18e36e4
Update submodules on '5.9' in qt5
...
Change-Id: I525727ffd60aabf0f8e964377f6a670f26a49338
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-03-02 22:01:24 +00:00
Liang Qi
82cea36531
Update submodules on 'dev' in qt5
...
Change-Id: Ia4717e7b16c135827c15e03bb8581d2a2f196547
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-03-01 19:53:58 +00:00
Allan Sandfeld Jensen
5f598f67f3
Add libxss-dev needed by QtWebEngine
...
Change-Id: Iac7e6b730803865d00b17d53e6aa488e80123b5b
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2017-03-01 16:34:16 +00:00
Liang Qi
df0092448a
Update submodules on '5.9' in qt5
...
Change-Id: Ia56d37f29ee715654aaeae85274073d74aedd0e8
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-03-01 12:08:29 +00:00
Liang Qi
92cec830f0
Update submodules on 'dev' in qt5
...
Change-Id: I789836bf447b14fe223489acea9fcb898d8a35aa
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-03-01 05:22:15 +00:00
Teemu Holappa
85f6859c3d
Change Boot2Qt to use Ubuntu 16.04
...
Changed Boot2Qt CI host from Ubuntu 14.04 to 16.04.
There is also changed the target architecture to x86_64.
Even though the meta-boot2qt builds binaries to the armv7 tests
are run in host machine using Qemu thus we spoof Coin to believe
we are running native binaries.
Change-Id: I633d01b80ec8ae753badf495ec8faa90b4659c11
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io >
2017-02-28 19:37:43 +00:00
Liang Qi
b94b02b9a0
Update submodules on '5.9' in qt5
...
Exclude qtbase this time.
Change-Id: Ib294e795f7c822f3bc8a66643880cf09994d09ac
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-02-28 09:36:11 +00:00
Liang Qi
0fdc536920
Update submodules on '5.8' in qt5
...
Change-Id: Icdce897429db6ec02938807bc2add8ae8d9a1ccc
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-02-27 04:01:39 +00:00
Svintsov Dmitry
6c6169f292
Make top-level configure script more portable
...
Remove hard-coded path to pwd; there is no need to have it, and for example
NixOS doesn't actually have it at this location, leading to such an error:
./configure: line 36: /bin/pwd: No such file or directory
/qtbase/configure not found. Did you forget to run "init-repository"?
Change-Id: If3372db3390ba5f39c5003d12ff2a466f39ff353
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io >
2017-02-24 12:19:39 +00:00
Liang Qi
b5e631ad6f
Update submodules on '5.8' in qt5
...
Change-Id: Id5ddefcb8bb28109f75b181e5db41ad98519ffc6
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-02-24 06:25:51 +00:00
Liang Qi
161f9ef9a5
Update qtbase manually
...
Change-Id: I5ccb9dbba46e97d213bfbb3a69393b7beed54665
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-02-24 06:25:33 +00:00
Oswald Buddenhagen
ed8f84f149
declare optional dependency of qtwebengine on qttools
...
starting with 5.7, it optionally comes with a qt designer plugin.
Change-Id: Idcc81b2688a1c09d3273b07a1ec991b54903e94c
Reviewed-by: Michal Klocek <michal.klocek@qt.io >
2017-02-23 09:48:32 +00:00
Liang Qi
e0416f4966
Update submodules on '5.8' in qt5
...
Change-Id: I81b3b50b87402c49a306d381c2d107fc6d4d91da
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-02-23 09:48:32 +00:00
Jani Heikkinen
9d03dae052
Update submodules on '5.9' in qt5
...
There seems to be some issue with updating all submodules so update
qtbase and qtdeclarative only to get INTEGRITY compile
Change-Id: I079837a75f20e649f26b4b55d66e65edf0ba33a5
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io >
2017-02-22 04:05:40 +00:00
Liang Qi
2df983757a
Update submodules on '5.8' in qt5
...
Change-Id: I2a905ff8300b2f64537446ee763202eeed216c6e
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-02-19 15:44:06 +00:00
Liang Qi
848c4ac3f8
Merge remote-tracking branch 'origin/5.6' into 5.8
...
Change-Id: I0203dea8e441e58400d6c44697588a44b97a522b
2017-02-17 15:22:56 +01:00
Liang Qi
7470f97c4e
Update qtwebengine manually again
...
Change-Id: I6fabfa3a4ce0b0fbcb1da2e15bdf5f8f6ac6e643
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-02-17 12:16:32 +00:00
Liang Qi
3fb0afb7f9
Update qtwebengine manually
...
Change-Id: I86dc97895dbbbff1a14e90d0a7c2ae359ce25891
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-02-16 15:00:58 +00:00
Tony Sarajärvi
628639ea0d
Add macOS 10.12 as a build target with tests disabled
...
Task-number: QTQAINFRA-1092
Change-Id: I0098a1ad9df115f911a401ba06a443a30374135b
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io >
2017-02-15 18:44:20 +00:00
Tony Sarajärvi
00635a672a
Provision: Set bash_profile to read .bashrc in macOS 10.12
...
The method (vmware tools) of launching a process inside a virtual
machine results in the launch of a process that does not originate
from a login shell. Therefore the CI system explicitly starts the
agent with "bash -l -c" to enforce the invocation as login shell
and thus execute settings from /etc/profile, ~/.bash_profile, etc.
This brings the behavior of the system closer to what we see as
developers.
However the shell is a non-interactive shell, therefore ~/.bashrc
is not read by default.
On Linux systems such as RHEL, ~/.bash_profile is configured to still
read ~/.bashrc.
For consistency we apply the same logic to the macOS configurations.
Task-number: QTQAINFRA-1091
Change-Id: I72206dbd8f7289de86830db23fa1ae2c548181eb
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io >
2017-02-15 18:44:14 +00:00
Tony Sarajarvi
c4a5844e25
Add MySQL provisioning script for macOS 10.12
...
Task-number: QTQAINFRA-1091
Change-Id: Id20e5398007284ddf809f2c2c49a60711729db26
Reviewed-by: Liang Qi <liang.qi@qt.io >
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io >
2017-02-15 18:44:10 +00:00
Tony Sarajarvi
a8348c9e6c
Add postgresql.sh provisioning script for macOS 10.12
...
Task-number: QTQAINFRA-1091
Change-Id: Idf314816d4986855b0b4d92a5f523ec1397f4083
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io >
2017-02-15 18:44:06 +00:00
Tony Sarajarvi
430aa0192d
Add cmake.sh to provisioning for macOS 10.12
...
Task-number: QTQAINFRA-1091
Change-Id: I3d58c7e94866754adb22975b874ebe4a0e239ec1
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io >
2017-02-15 18:44:03 +00:00
Tony Sarajarvi
1dbe2c1ff4
Add command line tool provisioning for macOS 10.12
...
Task-number: QTQAINFRA-1091
Change-Id: I2b209c8ca59af5bfdcc1faa46ac771a85eeb457e
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io >
2017-02-15 18:43:59 +00:00
Tony Sarajarvi
c3fa9ffd76
Add xcode.sh provisioning script for macOS 10.12
...
Task-number: QTQAINFRA-1091
Change-Id: I6d2071c3304cc8df31d8bbad6d713d21ea2dda25
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io >
2017-02-15 18:43:56 +00:00
Tony Sarajarvi
884d198a34
Add xz.sh provisioning script for macOS 10.12
...
Task-number: QTQAINFRA-1091
Change-Id: I5594ae5591ad0b092ed000da8930972475163f51
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io >
2017-02-15 18:43:51 +00:00
Tony Sarajärvi
a56c7ef768
macOS 10.12: Switch crash reporting to server mode
...
Task-number: QTQAINFRA-1091
Change-Id: I49c2f92f570a648e80ac16180bdf0c7967ed1120
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io >
2017-02-15 18:43:47 +00:00
Tony Sarajarvi
8254e8659f
Add system setup provisioning script for macOS 10.12
...
Task-numer: QTQAINFRA-1091
Change-Id: I0da0e22dd859609fa107b9c157a678a4e2d252e4
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io >
2017-02-15 18:43:43 +00:00
Jake Petroules
a5ba58e8dd
Remove QT_SKIP_MODULES declaration
...
These exclusions belong in the individual modules.
Change-Id: Iaa868bf953f7bc3d72b6508272a18798a8569f4d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io >
2017-02-15 18:02:33 +00:00
Liang Qi
e8231a46f2
Update submodules on '5.8' in qt5
...
Change-Id: Idb3b5cdd408d20582f10372a0e42e6f63e7a94bc
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-02-15 07:39:20 +00:00
Liang Qi
9e092f8cad
Update submodules on '5.9' in qt5
...
Change-Id: I631be2f14aa948c1c7678f7a1e0f2fd073a27ce5
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-02-14 20:56:59 +00:00
Tony Sarajärvi
58ad2e46f3
Add system setup provisioning script for Ubuntu 16.04
...
Task-number: QTQAINFRA-1099
Change-Id: I4ea578b65aca8511641a61461fd1295a3723fdab
Reviewed-by: Simo Fält <simo.falt@qt.io >
2017-02-13 14:27:28 +00:00
Tony Sarajärvi
d6beaa6f27
Add APT package provisioning to Ubuntu 16.04
...
Task-number: QTQAINFRA-1099
Change-Id: Ie884846a21c3962aeeb83762113475f9eaf2f20d
Reviewed-by: Simo Fält <simo.falt@qt.io >
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io >
2017-02-13 14:27:25 +00:00
Tony Sarajärvi
e5a1280ff0
Add Ubuntu 16.04 as a build target
...
As autotests pass, a subsequent commit will make
Ubuntu 16.04 replace Ubuntu 14.04 build targets.
Task-number: QTQAINFRA-1100
Change-Id: Ief659eec39f40873681ba617c37acf3662551fc1
Reviewed-by: Simo Fält <simo.falt@qt.io >
2017-02-13 14:27:22 +00:00
Liang Qi
d4e3b5f48d
Update qtlocation manually
...
Task-number: QTBUG-58807
Change-Id: Ia06d2a40c18d60e4665f0f7659ffd860a9deecf9
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-02-13 14:27:19 +00:00
Joerg Bornemann
ef0e6e1e8f
Add ForceDebugInfo to RHEL-6.6-x86_64
...
On this particular platform we get hard-to-reproduce autotest crashes in
the CI. Enable ForceDebugInfo to get a meaningful backtrace.
Change-Id: Ic9ca50394ad5708c3de4d26eb87d4c2a9d580b18
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io >
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io >
2017-02-13 12:33:28 +00:00
Liang Qi
36bedf10de
Update submodules on '5.8' in qt5
...
Change-Id: If01fe1a84460b65322bfe9d8c402f24d44e98094
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-02-12 06:57:40 +00:00
Liang Qi
79b410a77f
Update submodules on '5.9' in qt5
...
Change-Id: I04eca9ec2a5c278d53c83f5b73a7e154d33115a5
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-02-11 07:56:16 +00:00
Qt Submodule Update Bot
7fdf860fc5
Update submodules on '5.9' in qt5
...
Change-Id: I7c87e4fcd54dbaaa28dc6de510bcb6631fc14208
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io >
2017-02-10 16:11:18 +00:00
Brett Stottlemyer
dc4ec9c5d9
Add qtremoteobjects
...
Change-Id: Ie7e673d95b4930a93fc6d1a4aa86241061001bc2
Reviewed-by: BogDan Vatra <bogdan@kdab.com >
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io >
2017-02-10 00:17:37 +00:00
Jani Heikkinen
6c76752673
Change qtgamepad status from preview to addon
...
qtgamepad will be officially supported with Qt 5.9
Change-Id: I3f941189881f2ab32ef10d4fff242e0d075798f3
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io >
2017-02-10 00:17:33 +00:00
Liang Qi
de553b356b
Update submodules on '5.9' in qt5
...
Change-Id: Id4973a02255df2d2b311ac9f3b60d545bac3128f
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-02-09 18:23:52 +00:00
Tony Sarajärvi
e4769f9379
Add one OS X 10.11 configuration to the CI
...
The "-3" suffix for the configuration name is
due to it being a clean TIER1 image and has
not everything preinstalled manually.
Tests are disabled at first. They will be enabled
once we sort out all failing autotests.
Task-number: QTQAINFRA-1088
Change-Id: I7adc05869524acdff9ba295d604c3fc28a7aab99
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2017-02-09 08:36:22 +00:00
Tony Sarajärvi
9c80884735
Provisioning: remove extra crashreport script
...
We have a duplicate of the same file, but different name.
Change-Id: Iedd70498a91bde0dddb05c33972fd21274399ae8
Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io >
2017-02-09 08:36:20 +00:00
Tony Sarajärvi
ae5c1d4f5d
Provisioning: remove Android provisioning script
...
Android tools and NDK is not needed in 10.11.
Task-number: QTQAINFRA-1087
Change-Id: I8f3f4e71492ea09828823f6ef70ab29faa08934c
Reviewed-by: Simo Fält <simo.falt@qt.io >
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io >
Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io >
2017-02-09 08:36:17 +00:00
Tony Sarajärvi
8f9d75f18f
Add command line tools provisioning script for OS X 10.11
...
Task-number: QTQAINFRA-1087
Change-Id: I51aa4ee850d8e8603fac78572942e3be8f1175e4
Reviewed-by: Simo Fält <simo.falt@qt.io >
2017-02-09 08:36:15 +00:00
Tony Sarajärvi
0b3c843fb2
Add MySQL provisioning script to OS X 10.11
...
Task-number: QTQAINFRA-1087
Change-Id: If10ba5d5d3f2b4891098ffad8519fe4e16d8c268
Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io >
2017-02-09 08:36:13 +00:00
Tony Sarajärvi
fc32c9bbf7
Add postgresql provisioning script for OS X 10.11
...
Task-number: QTQAINFRA-1087
Change-Id: Ia186b8df007384f7fd03139ad448563b920ee21b
Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io >
2017-02-09 08:36:10 +00:00
Tony Sarajärvi
13ed034dc3
Add Cmake provisioning script for OS X 10.11
...
Task-number: QTQAINFRA-1087
Change-Id: If598b4b8391e13ed0891d8a65f752492fe303d29
Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io >
2017-02-09 08:36:08 +00:00
Tony Sarajärvi
f7d20b7cc2
Add XCode provisioning script for OS X 10.11
...
Task-number: QTQAINFRA-1087
Change-Id: I416b38459ef278f82af0379b46fd78f5ccc6512c
Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io >
2017-02-09 08:36:05 +00:00
Tony Sarajärvi
7a48b0d17c
Add xz.sh provisioning script for OS X 10.11
...
Task-number: QTQAINFRA-1087
Change-Id: I29879e17a18ffb7950c7a85db75f4bc2765741d5
Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io >
Reviewed-by: Simo Fält <simo.falt@qt.io >
2017-02-09 08:36:02 +00:00
Tony Sarajarvi
f969320ac5
Add provisioning PKG install helper script for bash
...
Task-number: QTQAINFRA-1087
Change-Id: I93f33e2e93371f68f31a9ed8b4d9c89ee091b629
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io >
Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io >
2017-02-09 08:35:59 +00:00
Tony Sarajarvi
dd1b6e53b1
Add provisioning helper script for installing compressed files
...
This script downloads a file from a given URL,
uncompresses it and installs it to a desired location.
Task-number: QTQAINFRA-1087
Change-Id: I466cb81ec6c96bb0d46329ec98dcc4f31be173ec
Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io >
2017-02-09 08:35:56 +00:00
Tony Sarajärvi
d6f56195bc
Add system setup provisioning for OS X 10.11
...
Task-number: QTQAINFRA-1087
Change-Id: Icba6d58c56fc00b4fe3a7a3f72050465ff64d104
Reviewed-by: Simo Fält <simo.falt@qt.io >
2017-02-09 08:35:54 +00:00
Liang Qi
15e396f7c3
Update submodules on '5.8' in qt5
...
Change-Id: I8c13bd75500b5fe21bde113b40b4e4161b8355f0
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-02-08 08:34:46 +00:00
Heikki Halmet
c8372d3641
Linux android builds to RHEL 7.2
...
In 5.9 android builds will be using
RHEL 7.2 instead of 6.6
Task-number: QTQAINFRA-1096
Change-Id: Ia802aa31fe347616c829e2142991686fe8e95ed9
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2017-02-06 12:07:46 +00:00
Liang Qi
5035a69e55
Update qtbase manually
...
Change-Id: I2e9330f0f037bd8637c4391fe5abde613aadc2ea
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-02-06 08:02:38 +00:00
Jani Heikkinen
b071c82d19
Merge "Merge remote-tracking branch 'origin/5.8' into 5.9" into refs/staging/5.9
2017-02-06 07:12:39 +00:00
Frederik Gladhorn
ce7b09a1fc
Add speech-dispatcher-devel to RHEL
...
Without this Qt Speech is useless in our packages.
Task-number: QTBUG-58461
Change-Id: I5c93fae1b3a2987353c75865f1b0831114afedbf
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2017-02-05 16:53:46 +00:00
Simon Hausmann
527829a600
Merge remote-tracking branch 'origin/5.8' into 5.9
...
Change-Id: Ic7dab06f6b6e6cf326df651151eade22429b997f
2017-02-05 15:17:50 +01:00
Liang Qi
bbdeca02e9
Merge "Merge remote-tracking branch 'origin/5.6' into 5.8" into refs/staging/5.8
2017-02-04 14:20:27 +00:00
Liang Qi
4b45cd68d4
Update submodules on '5.8' in qt5
...
Change-Id: Ic3a06dd310fd7b67b53b95c8f6b1ef8813449fe5
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-02-04 06:19:21 +00:00
Simon Hausmann
d641d6546b
Merge remote-tracking branch 'origin/5.6' into 5.8
...
Conflicts:
coin/provisioning/qtci-linux-RHEL-6.6-x86_64/android_linux.sh
Change-Id: I10fcdfc0af68741d931f4732783bafdad2fffc4a
2017-02-03 09:15:43 +01:00
Oswald Buddenhagen
2c1d5ad754
Merge remote-tracking branch 'gerrit/dev' into 5.9
2017-02-01 21:04:15 +01:00
Kari Oikarinen
321d5f1488
Provision libusb-1.0 for Windows
...
It's needed by tqtc-boot2qt/qdb.
Change-Id: Id5b8b18a2090c040c3eec1bd3c4c521456245381
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io >
2017-01-31 18:33:44 +00:00
Kari Oikarinen
db9682888c
Add PS provisioning helper for 7-Zip files
...
Change-Id: Ice10e54137da8a0d2372019a195a63121fd00a8a
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io >
2017-01-31 18:33:41 +00:00
Liang Qi
07b72ae2c3
Update qtconnectivity manually
...
Change-Id: Ic3c8400ab26b09277752e5b9b347dc7a33679618
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-01-31 17:16:33 +00:00
Simon Hausmann
dfaa59fcb3
Bump Android API level to 21
...
This extends commit f3b0b9e292eskil.abrahamsen-blomfeldt@qt.io >
2017-01-31 12:37:11 +00:00
Liang Qi
a20cc5b452
Merge remote-tracking branch 'origin/5.8' into dev
...
Task-number: QTBUG-58371
Change-Id: I9d7027c72fb10b5cc549762d8bb1f13ee5ec9c5d
2017-01-30 10:00:59 +01:00
Liang Qi
9be869ba48
Merge remote-tracking branch 'origin/5.6' into 5.8
...
Task-number: QTBUG-58371
Change-Id: Ic3ec10a04ec9fcfea38324f6052b2d082c6ece58
2017-01-28 12:21:28 +01:00
Liang Qi
98fa30e28e
Update submodules on '5.8' in qt5
...
Change-Id: If492971dc4c714f7d11e693d13abc64d6bba83e3
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-01-28 03:56:27 +00:00
Liang Qi
0874dba009
Merge remote-tracking branch 'origin/5.8.0' into 5.8
...
Change-Id: I20aad260fd151fc3261548eead12cb23fa3127b6
2017-01-26 15:54:16 +01:00
Liang Qi
18967fce7d
Update submodules on '5.8' in qt5
...
Change-Id: I51a509a5499af603c7eba23ba66b0ddb1eafa4f8
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-01-26 00:13:35 +00:00
Oswald Buddenhagen
29a926f941
Adjust submodule branches
...
Change-Id: Ifd38a97f7b51138504e8d7ace030a175640bc216
2017-01-25 11:39:31 +01:00
Simo Fält
61c59c145b
Restore RHEL 7.2 in the dev branch (5.9)
...
RHEL7.2 was disabled due to blocking configure change.
Task-number: QTBUG-58073
Change-Id: Ic517d53bddecbcf035410d4f22a678ab72e0d44d
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2017-01-25 03:24:37 +00:00
Liang Qi
f8eb9821c3
Update submodules on 'dev' in qt5
...
Change-Id: I80604b065ad943f7bbddeb6dba4ba05a78ba2c05
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-01-24 22:37:07 +00:00
Jesus Fernandez
1b8b891910
Add Coverity-Id to .commit-template
...
Change-Id: Icb7321584c59f5322ae2fb6d75f9d1b7ba2fcfe2
Reviewed-by: Marc Mutz <marc.mutz@kdab.com >
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io >
2017-01-24 10:23:27 +00:00
Liang Qi
84ed87b496
Update submodules on '5.8' in qt5
...
Change-Id: If8fe86b5faa11ef6a04a5433e325975e49361965
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-01-24 09:40:15 +00:00
Liang Qi
80358b1e1d
Update submodules on 'dev' in qt5
...
Change-Id: Ia7ef89c8452841c3bbf56bada0060e977fd310cc
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-01-23 15:33:13 +00:00
Liang Qi
1a3ff2b1af
Update submodules on '5.8' in qt5
...
Change-Id: I05b0a2ab6493c9435a8a37d129decf0596a8b84d
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-01-22 11:15:48 +00:00
Alex Blasche
f3b0b9e292
Bump Android API level version to 21
...
This is required for new Bluetooth features in Qt 5.9+.
Change-Id: I2aa41117dfd93fc94d72012ca229bd2bc61f2bbd
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2017-01-21 07:58:40 +00:00
Liang Qi
3e4f86d652
Update submodules on '5.8' in qt5
...
Change-Id: Ib1144af40af6562020a0f46fb1d31107a5e1e0e3
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-01-19 16:10:16 +00:00
Qt Submodule Update Bot
ee19f88fe0
Update submodules on '5.8.0' in qt5
...
Change-Id: Ib32e222f05e3af71d9f194683ba57f792343924d
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io >
2017-01-19 13:09:05 +00:00
Oswald Buddenhagen
e74b0f7df4
Merge remote-tracking branch 'origin/5.8' into 5.8.0
...
This pulls in the CI build configurations.
These files were previously stored in the CI source tree, but they do belong
here. They describe the different configurations under which we want to build
Qt and its submodules, in terms of underlying virtual machine template, host
OS, target OS and CI related features that may also map to Qt configuration
features.
Task-number: QTQAINFRA-1074
Started-by: Simon Hausmann <simon.hausmann@qt.io >
Change-Id: I8ab9b987a28566ad036dcaf8f0663bd633fea439
2017-01-18 10:49:22 +01:00
Liang Qi
b336c10c08
Update submodules on '5.8' in qt5
...
Change-Id: I6c8442fbe66f30e1c822efa0ff83387c25e6ac8f
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-01-16 11:41:13 +00:00
Liang Qi
c7e283a595
Update submodules on 'dev' in qt5
...
Change-Id: Iadacad3bd0da1cd22299a6ef7a7f662530b5494f
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-01-15 08:07:02 +00:00
Liang Qi
1ba2e08637
Update submodules on '5.8' in qt5
...
Change-Id: Ibd6924df667113c2a1c9b3a3e8f9c8d29c52c85c
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-01-14 08:01:20 +00:00
Simon Hausmann
a34d812580
Merge remote-tracking branch 'origin/5.8' into dev
...
This change also includes an update of the CI platform configurations to
the values that were previously in the CI source tree for builds of the
dev branch.
This is done within the same change as the merge to preserve atomicity.
Task-number: QTQAINFRA-1074
Change-Id: Ic47f7db3506ace4faca028b902d48cdb009c8495
2017-01-14 08:40:10 +01:00
Qt Submodule Update Bot
63d77a0b28
Update submodules on '5.8.0' in qt5
...
Change-Id: I13f342ad11d00e1d6df9af60290bbd97793b3a6d
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io >
2017-01-14 07:32:35 +00:00
Liang Qi
4d206f1fb6
Update submodules on 'dev' in qt5
...
Change-Id: I848fb61ce1e338d56bf665ad285d69b90bee06b9
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-01-13 16:28:56 +00:00
Simon Hausmann
9de5f6957c
Merge remote-tracking branch 'origin/5.7' into 5.8
...
This change also includes an update of the CI platform configurations to
the values that were previously in the CI source tree for builds of the
5.8 branch.
This is done within the same change as the merge to preserve atomicity.
Task-number: QTQAINFRA-1074
Change-Id: Iac469c44048721530380ab577c6dbf1a6fa28211
2017-01-12 22:19:30 +01:00
Liang Qi
7b17d411f1
Update submodules on '5.8' in qt5
...
Change-Id: Id1cef4535c8f5ef2b7d366b73ca4335e2c58f2a3
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-01-12 16:47:52 +00:00
Simon Hausmann
0f4fdb9490
Merge remote-tracking branch 'origin/5.6' into 5.7
...
This change also includes an update of the CI platform configurations to
the values that were previously in the CI source tree for builds of the
5.7 branch.
This is done within the same change as the merge to preserve atomicity.
Task-number: QTQAINFRA-1074
Change-Id: Ie7bde30bd64d439cd17ea789102550ab9fb44194
2017-01-11 16:29:06 +01:00
Liang Qi
4b6bff8044
Update submodules on '5.8' in qt5
...
Change-Id: I413f02de39f18259ab7bb10054ff75dc0ed04ed0
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-01-11 12:22:47 +00:00
Liang Qi
96a8c36ee8
Update submodules on '5.8' in qt5
...
Change-Id: I0d6757349b933d131aa0eef501dc3e1509a545c4
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-01-10 18:31:37 +00:00
Qt Submodule Update Bot
4cdbf1893f
Update submodules on '5.8.0' in qt5
...
Change-Id: I32db28a8a7f6068aca3fb6c34c15998b569e3d5e
Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io >
2017-01-09 11:15:26 +00:00
Simon Hausmann
ab9b902f3f
Merge remote-tracking branch 'origin/5.7' into 5.8
...
Change-Id: Id9533b63ae2e6d67d8c07101c406c40057c13b9f
2017-01-08 21:12:18 +01:00
Tony Sarajärvi
17c97ea79a
Add provision helper file to install compressed packages
...
Change-Id: I6a7e1af7c91bd11a0cc6379f8bb7762acf42eae5
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io >
2017-01-08 16:28:50 +00:00
Tony Sarajarvi
2b2188cc77
Add DownloadURL.sh provisioning helper script
...
Change-Id: I64bef8470555e33772b72847aa76e0e9b4720696
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io >
2017-01-08 16:28:39 +00:00
Tony Sarajarvi
c5e6abcafa
Add provisioning try-catch helper script for bash
...
Change-Id: Ia61e503ed5315546421fdeb2f4b8b1be37dab3e9
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io >
2017-01-08 16:28:32 +00:00
Qt Submodule Update Bot
e47e40eb1c
Update submodules on '5.8.0' in qt5
...
Change-Id: If96f0ff600589f565235c471fa3380bbe9848914
Reviewed-by: Liang Qi <liang.qi@qt.io >
2017-01-07 08:07:10 +00:00
Simon Hausmann
15e1dc2054
Merge remote-tracking branch 'origin/5.6' into 5.7
...
Change-Id: I9def17eb03e1c08d1e44c8f90841b1bf5160d638
2017-01-06 20:35:52 +01:00
Qt Submodule Update Bot
40addc7d81
Update submodules on '5.8.0' in qt5
...
Change-Id: I2cc710394ca9910d60bdf6d8e6079968a17f6270
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io >
2017-01-03 15:26:13 +00:00
Simon Hausmann
26775d4e3e
Merge remote-tracking branch 'origin/5.8' into 5.8.0
...
This brings in the Android OpenSSL fixes to allow the use of newer TLS
versions with Qt, the conan manifest updates to allow for provisioning
to work as well as a few other fixes from the stable branches.
Change-Id: If2e4a1b8a4c8e44cd8d9b8918a3083cbaf1b385c
2017-01-02 09:43:07 +01:00
Liang Qi
570c251596
Update submodules on 'dev' in qt5
...
Change-Id: Iea0ccd093912ab6a7ecb866c2592f23995a624d5
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-12-25 20:12:20 +00:00
Simon Hausmann
ffa5fe8b2f
Merge remote-tracking branch 'origin/5.7' into 5.8
...
Change-Id: I49d18025acb322bf45b6cdc38adb05618cb90153
2016-12-25 18:12:11 +00:00
Liang Qi
7cfb602367
Update submodules on '5.8' in qt5
...
Change-Id: I496fe34b7f81ae099fdb0733f87268ed805df992
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-12-25 10:59:20 +00:00
Konstantin Tokarev
678fcb4e66
Updated conan manifests after modification of packages
...
Change-Id: I60eee501254d41b438085b7b687af6aa2c085dba
Reviewed-by: Vitaliy Slobodin <vitaliy.slobodin@gmail.com >
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2016-12-24 07:32:20 +00:00
Simon Hausmann
591c6d0446
Merge remote-tracking branch 'origin/5.6' into 5.7
...
Conflicts:
coin/provisioning/common/02-python.ps1
Change-Id: I6b5f2c464cc350798c7c73fba9e79a3f4f534586
2016-12-21 21:38:29 +01:00
Qt Submodule Update Bot
10c4c43e52
Update submodules on '5.8.0' in qt5
...
Change-Id: I060ef5334c8d096c6167663b5c2dd8d45a5a2aec
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io >
2016-12-20 09:19:36 +00:00
Qt Submodule Update Bot
2c9249195d
Update submodules on '5.8.0' in qt5
...
Change-Id: Id31eaddee9fe5f64def0e4ddf3b81007c7fead16
Reviewed-by: Antti Kokko <antti.kokko@qt.io >
2016-12-19 08:56:44 +00:00
Qt Submodule Update Bot
5664df0625
Update submodules on '5.8.0' in qt5
...
Change-Id: I2f0a28823f83b2980989b3070a6ee91e1957ee7e
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2016-12-17 07:31:37 +00:00
Qt Submodule Update Bot
6c15dc0302
Update submodules on '5.8.0' in qt5
...
Change-Id: Ic73b70eb3399c4d1a69e76e0a55896ced61423b6
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io >
2016-12-16 19:55:39 +00:00
Liang Qi
79fa5f3c87
Update submodules on 'dev' in qt5
...
Change-Id: I37b7fb682d4d8db6cdc87ab8f10be55bc1094bd9
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-12-15 18:06:00 +00:00
Liang Qi
f8252d7f1c
Update submodules on 'dev' in qt5
...
Change-Id: I6624474fd032d697e851fa9ef0d087fde25195ae
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-12-14 14:48:58 +00:00
Liang Qi
94080ce9cf
Update submodules on '5.8' in qt5
...
Change-Id: I867f4a94c3cc5ff7252339520cc10721937e1187
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-12-13 05:04:56 +00:00
Liang Qi
2f9d551948
Update submodules on '5.7' in qt5
...
Change-Id: I87579c99e2ee1c2b7ab4d1cf3d403443f215cddb
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-12-12 08:18:36 +00:00
Liang Qi
79e3c32051
Update submodules on 'dev' in qt5
...
Change-Id: I6da970179afdf84cc629190c1a8b2595c35d4a06
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-12-12 07:29:06 +00:00
Qt Submodule Update Bot
6199444cce
Update submodules on '5.8.0' in qt5
...
Change-Id: I9dee754f6b2ea4be834a483012ec8e13fe72c8c8
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io >
2016-12-11 14:29:27 +00:00
Liang Qi
42e12a14f0
Update submodules on '5.8' in qt5
...
Change-Id: I245111cba87f41dfb18ca13527960d24e0a84700
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-12-10 19:02:18 +00:00
Qt Submodule Update Bot
46d87fb50e
Update submodules on '5.8.0' in qt5
...
Change-Id: I602ac700f615b32917a16cc368403978869b0c9a
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io >
2016-12-10 16:29:33 +00:00
Liang Qi
4cc6c5b7ee
Update submodules on '5.8' in qt5
...
Change-Id: Iab0f72430400b83be8664c232394959d81a9f28c
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-12-09 20:12:45 +00:00
Qt Submodule Update Bot
0b3ea7ef1b
Update submodules on '5.8.0' in qt5
...
Change-Id: I288795ff5b32bb847d17f1ae9828bc1c83102e8b
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io >
2016-12-09 18:22:00 +00:00
Qt Submodule Update Bot
a6cf19107c
Update submodules on '5.8.0' in qt5
...
Change-Id: Ia2d83e159b8648958cb123045aabd254330287ea
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io >
2016-12-08 10:10:22 +00:00
Qt Submodule Update Bot
8afbd91698
Update submodules on '5.8.0' in qt5
...
Change-Id: Ie42264d273d73c32f2763ed3c9dfa7dcb1ede5d6
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io >
2016-12-07 18:59:00 +00:00
Liang Qi
97e6ed74e4
Merge remote-tracking branch 'origin/5.8.0' into 5.8
...
Conflicts:
.gitmodules
Change-Id: I749924de83f87e436448bf1287fe057e2fe4c45b
2016-12-05 10:00:11 +01:00
Liang Qi
91191afe3f
Update submodules on '5.8' in qt5
...
Change-Id: Ibfed6d06a7f83a124b185c18ee690b2fb3141271
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-12-04 14:26:31 +00:00
Liang Qi
2c27ccd1c9
Merge remote-tracking branch 'origin/5.7' into 5.8.0
...
Change-Id: Ic9a6b04afe47529c4f953bace93e9c17d8c4d39d
2016-12-02 09:02:23 +01:00
Liang Qi
38c422a405
Update submodules on 'dev' in qt5
...
Change-Id: If15f5387b25fd86b6b1b481f0ec25928304d8c05
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-12-01 09:42:08 +00:00
Liang Qi
d379d768e6
Merge remote-tracking branch 'origin/5.6' into 5.7
...
Change-Id: Ib22c9e0f5c3e7c256ca083de33e6ad0475f20ce9
2016-12-01 09:58:28 +01:00
Liang Qi
877b3b9991
Update submodules on '5.8' in qt5
...
Change-Id: I0af8e18f49f251a347eb5afd9037bd0462edc9a9
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-12-01 06:20:02 +00:00
Liang Qi
794392344d
Update submodules on '5.8' in qt5
...
Change-Id: Ib16f362b961d0522c5f990d59f1e5d3974992190
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-11-30 18:36:09 +00:00
Konstantin Tokarev
860b38110b
Copy conanfile to conanbuildinfos directory
...
Conanfile is required for running "conan imports" as a part of "make install"
procedure, however its original location is unknown to build system of
module.
Conanfile is copied with its conventional name "conanfile.txt" to avoid
tying module build system to more qt5.git layout peculiarities. In
future we may want to have several conanfiles in one provisioning dir,
like qtwebkit-mingw.txt and qtwebkit-msvc.txt.
Also simplified syntax of PowerShell variables interpolation, $() is needed
only for interpolating expressions.
Task-number: QTQAINFRA-998
Change-Id: I6904e80f4f85bb5269b0830272c6eaa2c8100789
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2016-11-30 15:31:55 +00:00
Konstantin Tokarev
7dc66c9528
Updated conan to 0.16.0
...
* Use --no-imports when installing packages, imports will be performed
on "make install" step with new "conan imports" command.
* Add txt generator to all conanfiles because it will be needed for
"conan imports".
Change-Id: Ie5e7ac6bfbf14dfa32ce82136b6be5e39476e393
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2016-11-30 15:31:52 +00:00
Qt Submodule Update Bot
aed00a8dd3
Update submodules on '5.8.0' in qt5
...
Change-Id: I0222dbc952686d2bad1f4878a61047ace3fd4dce
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-11-30 05:38:04 +00:00
Liang Qi
b461645ce9
Update submodules on 'dev' in qt5
...
Change-Id: Ib6ed9acdc2de652ed0581ab2ce322bea072fec07
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-11-26 20:12:41 +00:00
Liang Qi
18a8082944
Update submodules on '5.8' in qt5
...
Change-Id: I602135f4911ae5dd19f188582f3b124eace332fd
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-11-26 20:08:33 +00:00
Liang Qi
b2d2d7bfff
Update submodules on '5.8' in qt5
...
Change-Id: I102175b389cd2470429d0b30bd2be1c92b90b5cf
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-11-26 12:25:31 +00:00
Liang Qi
ad1fc7cc5d
Update submodules on '5.7' in qt5
...
Change-Id: I81e9785dce8bbbe6bada7d90732cda708c98d0a4
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-11-26 10:22:00 +00:00
Liang Qi
8aa0940eef
Update submodules on '5.7' in qt5
...
Change-Id: I5bc3cdd755a3e29c936c1db7c51d0e1418be3a97
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-11-25 20:38:40 +00:00
Liang Qi
c28672909f
Update submodules on '5.8' in qt5
...
Change-Id: I3c22d33c28648ff6a9992200629e827533186fe1
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-11-24 06:36:11 +00:00
Konstantin Tokarev
7a1f4adf31
Update Ruby on Win7
...
QtWebKit requires newer Ruby than version installed on Windows 7 builders.
Install the same version as is installed on Windows 10 builders.
Task-number: QTQAINFRA-997
Change-Id: Id8e5d47028ef8403bb28daf1446d95dc8f2ab564
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2016-11-23 20:49:49 +00:00
Konstantin Tokarev
8114c71554
Added conan zlib package for MinGW on Windows 7
...
Change-Id: I48d904e95fce905b15b0099fee956c06773c4a75
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2016-11-23 08:46:30 +00:00
Liang Qi
6caace33b4
Update submodules on 'dev' in qt5
...
Change-Id: I301370485589fd11d69a3722e29818f037c75b43
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-11-22 20:07:31 +00:00
Liang Qi
0f8f2edbbb
Update submodules on '5.7' in qt5
...
Change-Id: I96e1ca64b6c2f6d4abb318d8e55f865eb24d4465
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-11-22 19:38:13 +00:00
Liang Qi
ae782a7f22
Update submodules on '5.8' in qt5
...
Change-Id: Ife77ec1889a7791fec833343329fc0c6b3345b34
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-11-22 09:07:06 +00:00
Qt Submodule Update Bot
7039b9f58b
Update submodules on '5.8.0' in qt5
...
Change-Id: Icffc85eb59ad4aca8eae32d74eb5ad34be37580e
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io >
2016-11-22 06:46:55 +00:00
Oswald Buddenhagen
bf4f3a434a
Adjust submodule branches
...
Change-Id: I154feb1976da9853cb4de7e70a4962ad0a6b4067
2016-11-21 12:48:41 +01:00
Liang Qi
53334e89e1
Update submodules on '5.7' in qt5
...
Change-Id: Ibd8707fd3c3219d7777bb4a82cfbbbf31837e960
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-11-20 23:39:13 +00:00
Liang Qi
4a9271061a
Update submodules on '5.8' in qt5
...
Change-Id: I5bb5f2c2af231ce4e5d483448cb000c3d20e1cf1
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-11-18 22:28:49 +00:00
Konstantin Tokarev
fa00780be3
When installing Python ensure that pip is installed too
...
If Python is not deinstalled cleanly (01-windows_removethemall.ps1
just erases installation directory) pip is not bootstrapped by new
installation. Fix it by running ensurepip module.
Change-Id: I3a7ed87eed30118876d7022eed94b8a571677529
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2016-11-18 22:19:26 +00:00
Konstantin Tokarev
aafc3f8644
Use full paths for invoking stuff from Python27\Scripts
...
Change-Id: I52094cc4b27b9e3a6fe3dd12c504777b8bb7bc75
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2016-11-18 22:19:23 +00:00
Konstantin Tokarev
a561a58bb6
Fixed broken conan manifest in qtci-windows-7-x86
...
Change-Id: I5c88b0d6e8ee6d8599b800a713d65111fbb4ad2a
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2016-11-18 22:19:20 +00:00
Konstantin Tokarev
48507e9e3c
Provisioning should fail in case of conan errors
...
Change-Id: I54ee86f5cf0f39cd7bafe71682b93a2a3c8fce5c
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2016-11-18 22:19:18 +00:00
Konstantin Tokarev
1bf242603c
Rename conan.ps1 and python.ps1 file in configuration dirs too
...
Order of files really matters in configuration directories, but I
renamed only main implementations in previous commit. Fixed that.
Change-Id: Ia541fa8fd36b3d52580ba9814e9f4c38aadce460
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2016-11-18 22:19:14 +00:00
Liang Qi
98861ac13d
Update submodules on '5.7' in qt5
...
Change-Id: I158e1550ffa19117258088b718dfaaa9d3f110df
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-11-18 08:05:04 +00:00
Liang Qi
e75eff13f1
Update submodules on 'dev' in qt5
...
Change-Id: I0c6056a80c3b5a078f8fe7e3a28206d50856fcb0
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-11-17 21:01:11 +00:00
Liang Qi
1e73f4067c
Update submodules on '5.8' in qt5
...
Change-Id: Ic90a01c01d497d9041dadc892ed95c4b55cc3dd8
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-11-17 17:55:40 +00:00
Liang Qi
acd40269d3
Merge remote-tracking branch 'origin/5.6' into 5.7
...
Change-Id: I1c5420f9d0a192f55623b2d46aec7a15b7877609
2016-11-17 11:41:55 +01:00
Qt Submodule Update Bot
42e9690d41
Update submodules on '5.8' in qt5
...
Change-Id: I9ce3b5468ba7249b07fefbe8cf015e7f136dfc12
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-11-17 08:24:41 +00:00
Konstantin Tokarev
f8e075a679
Install conan from pip instead of exe
...
This allows us to get it working on 32-bit Windows.
Also renamed conan.ps1 and python.ps1 to get proper provisioning order.
Change-Id: I2f21db7dd0edbacb4e44024d1c70b315fba55801
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2016-11-16 21:25:32 +00:00
Konstantin Tokarev
f910b2bbf9
Added MinGW support to conan.ps1, and conanfile for MinGW on Win 7
...
Change-Id: I0442437b33afd0195745a03301440e5eea6d4897
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2016-11-16 21:25:26 +00:00
Konstantin Tokarev
19c10b941c
Verify conan manifests when installing packages
...
This check allows us to ensure authenticity of installed files.
Manifests are sorted to minimize diffs in future updates.
Manifests lack trailing newline, because adding it would break manifest
parser of conan 0.15.0.
Task-number: QTQAINFRA-998
Change-Id: I6db75a78ce552da29d63cc4ac03726df326b7be2
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2016-11-16 21:25:21 +00:00
Konstantin Tokarev
93240adad1
Fixed conanfile options after packages were renamed
...
Change-Id: I4dbd3ec43bb6edfff7b9f98ac697cc7b70b09cda
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2016-11-16 21:25:15 +00:00
Qt Submodule Update Bot
77741d7d6c
Update submodules on '5.7' in qt5
...
Change-Id: Ia039f19c48f0e6140da7113288cd4c3b5e71ffd9
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-11-16 07:06:30 +00:00
Qt Submodule Update Bot
b308713d63
Update submodules on '5.8' in qt5
...
Change-Id: I15c7339a78428a167ac1f8fb74faa08d622b957c
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-11-15 11:05:09 +00:00
Qt Submodule Update Bot
f9ef2cad3c
Update submodules on 'dev' in qt5
...
Change-Id: Ic6fdae41e0064726fa0349e6d153ce1ce6cabdba
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-11-13 07:21:47 +00:00
Qt Submodule Update Bot
7f78ad5d04
Update submodules on '5.7' in qt5
...
Change-Id: I78258b727f35536b5ec7852a175922f0852653cf
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-11-12 18:24:59 +00:00
Qt Submodule Update Bot
1807cf7a38
Update submodules on '5.8' in qt5
...
Change-Id: I7ad982a779dd3b1856f6bfd1b1e769022a1b27a7
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-11-11 23:12:51 +00:00
Liang Qi
4846460da8
Update submodules on 'dev' in qt5
...
Change-Id: I8cd3169f2fd6d00006175b8012134450e44b3bb3
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-11-11 06:56:35 +00:00
Qt Submodule Update Bot
aba872f2dd
Update submodules on '5.8' in qt5
...
Change-Id: I6514b942b7346a91ba3ad88af968286b6a859044
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-11-10 05:37:07 +00:00
Konstantin Tokarev
b1964fc7e5
Upgraded conan to 0.15.0
...
Change-Id: I9219094dfffb4edd90fcab00fb28c8b7658cfb42
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2016-11-09 18:33:39 +00:00
Liang Qi
b198efeffb
Update submodules on '5.8' in qt5
...
Change-Id: I77ff5ade4c00778ccecf52667e9f514712344680
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-11-09 16:25:01 +00:00
Qt Submodule Update Bot
70fd49d277
Update submodules on '5.8' in qt5
...
Change-Id: I813d7017a69fc6550787880e6211f07dd9979851
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-11-07 16:53:43 +00:00
Konstantin Tokarev
daa8653121
Upgrade CMake to 3.6.2 on Windows 7 builder
...
Task-number: QTQAINFRA-996
Change-Id: I84867a5b630c4cf1e712047c58c6cad9e5e43800
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2016-11-07 11:59:05 +00:00
Konstantin Tokarev
05f4779eae
Update package names and options in qtwebkit conanfiles
...
Task-number: QTQAINFRA-997
Change-Id: I19634c06041286fe44c787efe038d5ab24888b1f
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2016-11-07 11:59:03 +00:00
Qt Submodule Update Bot
829820f51a
Update submodules on '5.7' in qt5
...
Change-Id: I8c0dd734d7e74a7ccd6419211de705be4bf5dd25
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-11-05 20:06:05 +00:00
Qt Submodule Update Bot
2c1bc72b22
Update submodules on '5.8' in qt5
...
Change-Id: Ida45b8f7371489e823fae95759835895805600b7
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-11-05 08:58:46 +00:00
Qt Submodule Update Bot
d483ed9fd1
Update submodules on '5.8' in qt5
...
Change-Id: I08e288a112a342efec122fdd6ceabe8c6ad9ea94
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-11-03 17:54:55 +00:00
Qt Submodule Update Bot
0cacec9365
Update submodules on '5.7' in qt5
...
Change-Id: I7b50d64a16e3dfbfdfc153cc06c2dd0af73734f5
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-11-03 08:24:39 +00:00
Qt Submodule Update Bot
8835d34cae
Update submodules on '5.8' in qt5
...
Change-Id: I2671f23d719d22a3e330a9b6f1eb271d7da74e1a
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-11-03 05:36:58 +00:00
Qt Submodule Update Bot
6fe694ef9e
Update submodules on '5.8' in qt5
...
Change-Id: I24dadef83afb66c4cc6d3ee96cb753e9c12c6e87
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-10-30 12:03:53 +00:00
Qt Submodule Update Bot
7cf1472896
Update submodules on '5.7' in qt5
...
Change-Id: Ib7052a661f2b881e5dd45e7e0660ac3b9f2be0b0
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-10-29 12:04:28 +00:00
Qt Submodule Update Bot
1121bd050b
Update submodules on '5.8' in qt5
...
Change-Id: I762434e6bb122ac5118e73672ce443bb3009d829
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io >
2016-10-28 01:50:03 +00:00
Liang Qi
d4330b54d9
Update submodules on '5.8' in qt5
...
Change-Id: Iedd29491fc105df54ab9e670bea8f1d0becb1e23
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-10-27 11:16:24 +00:00
Fredrik Orderud
e0d82e099c
Update qtquick1 submodule on '5.8' in qt5
...
Fixes broken build caused by qtquick1 not being in sync with interface
changes in qtbase.
Task-number: QTBUG-56642
Change-Id: I972bcef2564c4f9bd7abe1a3e38c77339aaf30e9
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2016-10-24 09:37:11 +00:00
Qt Submodule Update Bot
dffdec4c38
Update submodules on '5.7' in qt5
...
Change-Id: I346c0d758f888c917e57c5e784063d26fc87ccb4
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-10-23 06:26:57 +00:00
Qt Submodule Update Bot
79f1945c39
Update submodules on 'dev' in qt5
...
Change-Id: Ic719d17edc11df7808a381627695655ba659148f
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-10-22 06:29:43 +00:00
Qt Submodule Update Bot
9f921b9cc3
Update submodules on '5.8' in qt5
...
Change-Id: I70a3a9621a800f655406d4827f533c2378963312
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2016-10-21 17:00:51 +00:00
Qt Submodule Update Bot
161dcd9117
Update submodules on '5.8' in qt5
...
Change-Id: Ia4c6e9eae9eab645779dfc31818527fcef3e5fe2
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-10-21 04:45:36 +00:00
Qt Submodule Update Bot
6f7ad4c6f5
Update submodules on 'dev' in qt5
...
Change-Id: I1aa41dfd34b34f97a515a2969f512c41386137e3
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org >
2016-10-20 07:29:55 +00:00
Qt Submodule Update Bot
feae87fc48
Update submodules on 'dev' in qt5
...
Change-Id: I9fb801475eb21c37d5d33b4fb14d4700554a5149
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org >
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-10-19 12:47:10 +00:00
Liang Qi
b5e7776935
Update submodules on '5.8' in qt5
...
Exclude qtbase to avoid QTBUG-56580.
Change-Id: I70cd6027112a94824fdea2264866bfaeda8ee41c
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-10-18 16:06:27 +00:00
Liang Qi
d541bad5b0
Update submodules on '5.8' in qt5
...
Change-Id: I30d63257b6a095fd75c41bf97e24f584374eb542
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-10-17 21:42:40 +00:00
Qt Submodule Update Bot
f2bae3b27d
Update submodules on '5.7' in qt5
...
Change-Id: I37d33578ba4b2e48403226c8a41ff289f77ebf1a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org >
2016-10-15 19:28:06 +00:00
Qt Submodule Update Bot
7f941c05ca
Update submodules on '5.7' in qt5
...
Change-Id: If8ce107ce65ebde81732c1ccbc1b2212eb2ac89b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org >
2016-10-14 14:39:48 +00:00
Liang Qi
6d2714d6be
Update submodules on '5.8' in qt5
...
One more without qtdeclarative update.
Change-Id: I45afafd217da9153c7ce18336f9ab1d5d9530d8b
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-10-13 07:33:24 +00:00
Qt Submodule Update Bot
4796403663
Update submodules on 'dev' in qt5
...
Change-Id: Ic0831856c7b3d9014068c48f10d776085e16ba7c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org >
2016-10-12 01:30:52 +00:00
Frederik Gladhorn
837f579a8c
Update submodules on '5.8' in qt5
...
Since qtdeclarative seems to trigger a crash in qtquickcontrols' tests,
leave it out for now, just to see some progress.
Change-Id: I8799f0ae70ad9b78f5be4cb7a53cbeac7df3295b
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io >
2016-10-11 20:58:19 +00:00
Qt Submodule Update Bot
f2fc36b021
Update submodules on '5.7' in qt5
...
Change-Id: Ib91dfec2ce8b7e794a26367f658581672d5cc2e2
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-10-10 05:44:06 +00:00
Liang Qi
766a4f11ea
Update submodules on 'dev' in qt5
...
Change-Id: I33398bb5031c34b1afb24d992fdaebca86e987d1
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2016-10-07 22:37:57 +00:00
Qt Submodule Update Bot
0750f2b6ce
Update submodules on '5.7' in qt5
...
Change-Id: I0fcbfa1705b1c2a93f5ced9a07d300e18ae9b7b3
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-10-07 21:17:31 +00:00
Liang Qi
741efb1f91
Merge remote-tracking branch 'origin/5.8' into dev
...
Change-Id: Ib37d1a012dad4bcb3b830d2557dab1ed6cb091ea
2016-10-07 08:23:05 +02:00
Liang Qi
bf9ed6466f
Update submodules on '5.8' in qt5
...
Change-Id: I423324fe84f2bb434fad8a717d05eae680a94e69
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2016-10-06 17:41:36 +00:00
Liang Qi
bb430e6222
Merge remote-tracking branch 'origin/5.7' into 5.8
...
Change-Id: Ic1d8d79b979cb77fe93acae2c279cf8a4f4e2a71
2016-10-06 12:11:18 +02:00
Konstantin Tokarev
5b0a9d688b
Log arguments passed to Start-Process in Run-Conan-Install
...
Task-number: QTQAINFRA-998
Change-Id: Ic27762a0403132cb8c2dcdb9f5a83ae9292e2d2a
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2016-10-05 21:25:43 +00:00
Konstantin Tokarev
cf257c2869
Pass compiler.runtime setting to conan
...
When MSVC is not autodected, necessary setting compiler.runtime has
undefined value, breaking installation of packages. This setting is not
supported by MinGW, so it should be optional.
Task-number: QTQAINFRA-998
Change-Id: Ia1a09eee14275314c160c7c45cd6ab276367dcdb
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2016-10-05 21:25:35 +00:00
Konstantin Tokarev
433f6dddb5
Execute Conan installer synchronously
...
PowerShell runs .exe's asynchronously by default, unlike all other commands.
This behavior creates race condition when conanfile processing starts before
conan installation is completed. Addition of "| Out-Null" to installer
invocation makes it synchronous.
Task-number: QTQAINFRA-998
Change-Id: Ic423514f15886e6ad9eb5c9422dd5382a3362380
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2016-10-05 21:25:28 +00:00
Liang Qi
e5627e6de3
Update submodules on '5.7' in qt5
...
Change-Id: Ifb5d6145b2c4b4bf881cf6414d2b5c76382c8757
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io >
2016-10-05 14:38:22 +00:00
Liang Qi
eb78767825
Merge remote-tracking branch 'origin/5.6' into 5.7
...
Conflicts:
coin/provisioning/common/helpers.ps1
Change-Id: I9bf6180f7d2ee1ff1c7722eed3c21d416ba7410e
2016-10-04 11:10:59 +02:00
Qt Submodule Update Bot
7b8fe9c0ed
Update submodules on 'dev' in qt5
...
Change-Id: I737902b8cc54ce8394c377f6cdafe14c49c2a588
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org >
2016-10-04 04:57:22 +00:00
Qt Submodule Update Bot
bc65857c58
Update submodules on '5.7' in qt5
...
Change-Id: Icb268cea1648c3219be1bb2ac8d9819971e9a033
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org >
2016-10-02 20:52:35 +00:00
Liang Qi
538d7a0538
Update submodules on 'dev' in qt5
...
Change-Id: Id24be2272e6fe7256c6f96c1c54c2baf933f793f
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-10-01 13:03:28 +00:00
Qt Submodule Update Bot
6ddf18df95
Update submodules on '5.8' in qt5
...
Change-Id: I3edb8eeb7f599148ba577aea3c6677e8e6423d69
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-10-01 08:48:43 +00:00
Konstantin Tokarev
680c596ca0
Revert "Changed slash direction in CI_CONAN_BUILDINFO_DIR"
...
This actually breaks conan integration in Coin instead of fixing it.
This reverts commit b0b0c9c471simon.hausmann@qt.io >
2016-10-01 06:35:46 +00:00
Liang Qi
0e4688d36e
Merge remote-tracking branch 'origin/5.8' into dev
...
Conflicts:
.gitmodules
Change-Id: I6f517c976152f2da390c556c7c9da08aaec4be90
2016-09-30 16:13:52 +02:00
Liang Qi
a5b6125466
Merge remote-tracking branch 'origin/5.7' into 5.8
...
Change-Id: I4060b0ddeb5a77c40b31e1ce1dafd2e878b48e12
2016-09-30 09:27:59 +02:00
Konstantin Tokarev
77eeee64a4
Upgrade CMake to 3.6.2
...
QtWebKit requires CMake >= 2.8.12, while only 2.8.11 is available on
Windows 10 machines.
Task-number: QTQAINFRA-996
Change-Id: I734be4cc36f64dd5aeb243b0fbe4395c75c523b3
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2016-09-30 07:20:41 +00:00
Simon Hausmann
6fabd34960
Merge remote-tracking branch 'origin/5.6' into 5.7
...
Change-Id: Ibf285f0d67fc5125c1c7da6dfc5b62b834d34867
2016-09-28 16:41:56 +02:00
Qt Submodule Update Bot
657cab9312
Update submodules on '5.7' in qt5
...
Change-Id: Id084a6f6a3ce4109beb1f36088afe2914ffa7735
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org >
2016-09-28 04:43:38 +00:00
Simo Fält
1148171a5d
COIN Provisioning: Install ICU to RHEL 7.2
...
Change-Id: I9d99c9e8a10b89f430fd6a07932b9330cfb49726
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io >
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2016-09-28 04:36:48 +00:00
Simo Fält
06c59b27db
COIN Provisioning: Disable selinux in rhel 7.2
...
Change-Id: I03c2b70e4c05440c6cf1a6d355f5800c67f62bb7
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2016-09-28 04:36:40 +00:00
Qt Submodule Update Bot
40399ae1cc
Update submodules on '5.8' in qt5
...
Change-Id: Ia2e717ea4f71a3032146f3fc8b98f96d141f1f92
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io >
2016-09-28 04:36:31 +00:00
Konstantin Tokarev
b0b0c9c471
Changed slash direction in CI_CONAN_BUILDINFO_DIR
...
Change-Id: I13bea231301f12a3992abc11119fc34543e75ab2
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2016-09-26 13:51:15 +00:00
Qt Submodule Update Bot
ec6d9b53b4
Update submodules on '5.7' in qt5
...
Change-Id: I10f0169fa184c4f0c297af4b8f8795a711d88e58
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-09-25 14:00:21 +00:00
Qt Submodule Update Bot
cce1584b78
Update submodules on '5.8' in qt5
...
Change-Id: Iec230ba54c75039fe1b0506540e52a598fff2510
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-09-25 09:53:20 +00:00
Qt Submodule Update Bot
dcc26dafad
Update submodules on '5.7' in qt5
...
Change-Id: I2a5733b235e381990aa51c87af3d69fa2582541f
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-09-25 09:04:39 +00:00
Qt Submodule Update Bot
69d08a86b0
Update submodules on '5.8' in qt5
...
Change-Id: Ie862b6f2ec78e6c24f8f5bd0ee959e598f3d33d8
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-09-24 04:28:05 +00:00
Qt Submodule Update Bot
7c6a3f423a
Update submodules on '5.7' in qt5
...
Change-Id: I0471e3be4be3b6109fe2afab79ba26915eede933
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org >
2016-09-23 08:23:40 +00:00
Qt Submodule Update Bot
cb480a3860
Update submodules on '5.8' in qt5
...
Change-Id: Ic9386ba7ad3b9a28180719440af6eeb64f4483ff
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-09-22 05:15:15 +00:00
Kari Oikarinen
0536958614
Provision libusb-1.0 for Linux
...
It is a dependency of tqtc-boot2qt/qdb, which will join CI soon.
Change-Id: I3b205877e705f554202ab7171f9d828491b95ac6
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io >
2016-09-21 09:45:21 +00:00
Liang Qi
891afe7066
Update submodules on '5.7' in qt5
...
Change-Id: Ibdccfa62d894d5e2b3a72bf09d72b4c9c7ff1981
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-09-20 20:47:42 +00:00
Qt Submodule Update Bot
2d61b0871d
Update submodules on '5.8' in qt5
...
Change-Id: Ic49edc7055336d6717fdd985798f665db3803384
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-09-20 20:47:04 +00:00
Konstantin Tokarev
23d1112839
Fixed value of CI_CONAN_BUILDINFO_DIR variable when provisioning Windows
...
Change-Id: I841783122edf82739826cc0a7672d8c809870e97
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2016-09-18 05:57:54 +00:00
Konstantin Tokarev
e1bfa77391
Do not use qmake and cmake generator automatically for each conanfile
...
Keep conanfiles self-contained. "txt" generator is not going to be used
by coin internally, drop it.
Task-number: QTQAINFRA-998
Change-Id: I80ffb7342e07d8ef883bed6de77ac9646479f145
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2016-09-17 11:06:44 +00:00
Konstantin Tokarev
fd6fe04cad
Added cmake_installer, imports and explicit library types to conanfiles
...
Task-number: QTQAINFRA-997
Change-Id: I70b51a47c12928944d9f48be13332fce12296af1
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2016-09-17 11:06:40 +00:00
Konstantin Tokarev
0958cc4cca
Changed BuildinfoDir of conan to use Coin-compatible compiler name
...
Task-number: QTQAINFRA-998
Change-Id: Ica31bf88055cb46eb9b6a0438ba5df461b6c8e5f
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2016-09-17 11:06:35 +00:00
Frederik Gladhorn
b5944e9485
Make sure to install gtk 3 and gstreamer on RHEL 7
...
Change-Id: I95c570431c5b78e24754b6e08be0172071da3c51
Reviewed-by: Simo Fält <simo.falt@theqtcompany.com >
2016-09-15 09:47:32 +00:00
Qt Submodule Update Bot
387e428e9a
Update submodules on '5.8' in qt5
...
Change-Id: Ibe4e45b892e4e1caae53808b916bc13630ab88f9
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-09-15 09:47:18 +00:00
Oswald Buddenhagen
64cc947ded
automatically launch new configure system in top-level builds
...
this includes moving the -skip option here, where it belongs.
the implementation is a bit hacky, but the proper one would be vastly
more complex: we'd have to load all modules, then parse the command
line properly (the -skip parsing would be a custom callback, to avoid
needing to process features), then discard all now excluded modules
again, then re-process the command line (so we can complain about
options which are now invalid), and only now proceed with the actual
feature processing.
that seems a bit over the top, so we accept that -skip cannot be the
argument of another option, which seems quite reasonable.
Change-Id: I0053658e6d7e11b82cdfe55893cb553b664a9298
Reviewed-by: Jake Petroules <jake.petroules@qt.io >
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io >
2016-09-15 06:52:35 +00:00
Konstantin Tokarev
78a764ee65
Install conan dependencies if there is conanfile.txt for module
...
Change-Id: Ie331331f6383444c4329e7a57cb8a8b25e58bd2f
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2016-09-14 22:31:17 +00:00
Konstantin Tokarev
b6414f7d08
Added conanfiles for qtwebkit
...
Task-number: QTQAINFRA-997
Change-Id: I7aadf3549affeeeb3130d8fdb9ff15242a36aeb9
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2016-09-14 22:31:11 +00:00
Konstantin Tokarev
99ff42545f
Install Conan on Win10
...
QtWebKit will use Conan to install 3rd party dependencies like ICU.
Task-number: QTQAINFRA-997
Change-Id: I4b9bfeb86b28abfdef52afcf249428c3ec41f32a
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2016-09-14 22:31:01 +00:00
Konstantin Tokarev
90f5a25c66
Update Ruby on Win10
...
QtWebKit requires newer Ruby than version installed on Windows 10 builders.
Task-number: QTQAINFRA-997
Change-Id: Id4f917a824daaab4aeb1445a3a16906663208b6d
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2016-09-14 22:30:52 +00:00
Liang Qi
3e5229c689
Merge remote-tracking branch 'origin/5.7' into 5.8
...
Change-Id: I62235fec5e9b8b81e41d64bfcf58067dc1213d0c
2016-09-13 12:14:43 +02:00
Liang Qi
4477c49291
Merge remote-tracking branch 'origin/5.6' into 5.7
...
Conflicts:
coin/provisioning/qtci-linux-RHEL-6.6-x86_64/android_sdk_linux.sh
Change-Id: Ib972234bb644353db6920b2dcbe1fd4775ef1779
2016-09-12 15:09:56 +02:00
Qt Submodule Update Bot
1c06b83ff0
Update submodules on '5.8' in qt5
...
Change-Id: I4bd1038cd3ee8cefcfb27179527511c41a0af799
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-09-08 04:27:50 +00:00
Qt Submodule Update Bot
33feec0dc8
Update submodules on '5.7' in qt5
...
Change-Id: Ic053fa3b81c674e4a63419bdab848e362b2a93a6
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-09-07 04:20:09 +00:00
Qt Submodule Update Bot
2fb27862aa
Update submodules on 'dev' in qt5
...
Change-Id: I4e7a32798c5b37f63776f8c8ee5e21e9d198895f
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-09-06 17:14:38 +00:00
Qt Submodule Update Bot
72c617cf91
Update submodules on '5.8' in qt5
...
Change-Id: Ic507adbb59d9a95afa4c188223f8e0a5d2d5d03c
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-09-05 04:38:30 +00:00
Qt Submodule Update Bot
64f62b4b95
Update submodules on '5.7' in qt5
...
Change-Id: I8309b4fd697efb7b539c84d0c351b25c230a4950
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org >
2016-09-03 23:30:51 +00:00
Qt Submodule Update Bot
5b7def1433
Update submodules on '5.8' in qt5
...
Change-Id: I457d16bb5c82d98dfc0995e84c08fee89d872e89
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2016-09-01 03:23:21 +00:00
Qt Submodule Update Bot
70361aac02
Update submodules on '5.8' in qt5
...
Change-Id: I165c8b4ae2709d009462b7fa5b91561759524e5f
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io >
2016-08-29 04:29:14 +00:00
Qt Submodule Update Bot
85771ddaaa
Update submodules on '5.8' in qt5
...
Change-Id: I558721d2b7a630453ce794e7b7b97e1fca5ef3dc
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io >
2016-08-28 17:43:30 +00:00
Simon Hausmann
31d8277404
Remove qtsystems from the list of recommended modules in qtlocation
...
QtSystems is not a supported module at the moment, and the code in
QtLocation to utilize QtSystems is behind an #ifdef and destined for
removal.
Change-Id: Ide44f138638ccd751044c13c289f1e116641a23e
Reviewed-by: Alex Blasche <alexander.blasche@qt.io >
2016-08-28 17:43:26 +00:00
Qt Submodule Update Bot
42ed864856
Update submodules on '5.7' in qt5
...
Change-Id: I726579f7e3e25774dc882c1c9d4780ccf23deaed
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-08-26 19:04:36 +00:00
Qt Submodule Update Bot
7831d61e82
Update submodules on '5.8' in qt5
...
Change-Id: I188c217abff06c901f6da7561bc7ed1f3c12d8b1
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io >
2016-08-24 18:02:48 +00:00
Jani Heikkinen
56fc6bc77b
Removed TP status from qtscxml and qtserialbus
...
Change-Id: I8ed4edcdf9eab48ec1ac278d3e8de38149b0fd8d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com >
2016-08-24 18:02:44 +00:00
Oswald Buddenhagen
71524c78f6
Merge remote-tracking branch 'origin/dev' into 5.8
...
Note that this also contains the adjustment of the branch for the
latecomers qtspeech and qtnetworkauth.
Change-Id: Ia77eb4d47a6ad66cb35e50ae03af751f46a805a8
2016-08-24 19:54:10 +02:00
Jesus Fernandez
b78f3579af
Add qtnetworkauth
...
Change-Id: I4cd81725d0aec29ff3252a84504a81a44d1b60eb
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com >
2016-08-22 09:03:20 +00:00
Oswald Buddenhagen
6cfd3a2118
fix branches of qtpim and qtsystems
...
these repos were definitely _not_ branched for 5.7.
Change-Id: Ib31d4e07f2651cfba0a7d31a9db1f1a812061313
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io >
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-08-18 04:29:08 +00:00
Qt Submodule Update Bot
af364a39aa
Update submodules on '5.7' in qt5
...
Change-Id: I8b849ebf5685a65206d1c60d1c3f7b85e3e6716d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org >
2016-08-18 04:28:57 +00:00
Frederik Gladhorn
80ee813a03
Make QtSpeech a tech preview release for Qt 5.8
...
Change-Id: I144109a45bece4b2283c24ad7aae64c098f86963
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io >
2016-08-17 08:37:40 +00:00
Qt Submodule Update Bot
9410b99b16
Update submodules on 'dev' in qt5
...
Change-Id: Ie425f3f5a64e83702a6987d2892fbfa68bea5844
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-08-17 07:26:42 +00:00
Qt Submodule Update Bot
40e137cbee
Update submodules on '5.7' in qt5
...
Change-Id: I5494d36a2b93a85acbc5825f5bd73d032a4098a9
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org >
2016-08-11 23:30:46 +00:00
Oswald Buddenhagen
7efeb26af7
Adjust submodule branches
...
Change-Id: I6e8c8e91b7e17efa93b24e8026fa3f340bd10e9d
2016-08-08 11:06:22 +02:00
Qt Submodule Update Bot
5c5e807018
Update submodules on '5.7' in qt5
...
Change-Id: I0f7724142af344e35897035016b03ce046c8164e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org >
2016-08-07 23:30:49 +00:00
Qt Submodule Update Bot
fc1d30a447
Update submodules on '5.7' in qt5
...
Change-Id: I59475dd0549f9c4c83ad830a76b3b5225aa90eda
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org >
2016-08-06 23:30:51 +00:00
Qt Submodule Update Bot
acafa69d57
Update submodules on '5.7' in qt5
...
Change-Id: I92e5272d0d0662bfed36e2fa51d25b729e89a172
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-08-06 10:01:05 +00:00
Liang Qi
23f5d41bec
Merge remote-tracking branch 'origin/5.7' into dev
...
Change-Id: I91cf0b6132a73c34c63d83a0bee1c028f2f819f8
2016-08-06 06:20:21 +02:00
Qt Submodule Update Bot
525a85bd6d
Update submodules on 'dev' in qt5
...
Change-Id: I5c05b788003c8c274914ad5533d1eb7971c6e823
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-08-05 18:20:17 +00:00
Liang Qi
95ff2f4870
Merge remote-tracking branch 'origin/5.6' into 5.7
...
Change-Id: I1a08537bcd4748ebbb3e5a670e3a099779f33945
2016-08-05 09:04:05 +02:00
Qt Submodule Update Bot
b385314451
Update submodules on '5.7' in qt5
...
Change-Id: I203ab93ecfa295c0a8051b85855333e5a92030c8
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-08-05 05:49:36 +00:00
Qt Submodule Update Bot
67754033cf
Update submodules on '5.7' in qt5
...
Change-Id: I03f7c07e68856947471fe9976ff996b680c9fabf
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-08-03 01:55:05 +00:00
Qt Submodule Update Bot
6fe0028baa
Update submodules on '5.7' in qt5
...
Change-Id: I65292231de671b660f232f0ccac7aeb4ae700f59
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org >
2016-08-02 05:34:43 +00:00
Qt Submodule Update Bot
447361eb68
Updated submodules
...
Change-Id: Id18ec0d487df664c69aff8a8fe8a2ceff64ab42d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org >
2016-07-19 10:42:19 +00:00
Qt Submodule Update Bot
d5e52dbe26
Updated submodules
...
Change-Id: I4e1ec0bbeccad560b49b39b4280950684209445d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org >
2016-07-15 08:17:10 +00:00
Qt Submodule Update Bot
ddae625e19
Updated submodules
...
Change-Id: If0b6c9e8ddac98085848e44d84ad26e9cc403043
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org >
2016-07-14 11:17:44 +00:00
Qt Submodule Update Bot
a4280c4f44
Updated submodules
...
Change-Id: If321cd042d8edc2a0532352d2c994e1c2614c9a0
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org >
2016-07-12 11:40:31 +00:00
Qt Submodule Update Bot
24961e9f2c
Updated submodules
...
Change-Id: Ia252cef752425c836304bd94fd00de3532b79813
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org >
2016-07-06 08:53:10 +00:00
Qt Submodule Update Bot
1240baedcc
Updated submodules
...
Change-Id: Idf41e8902a32fd125c7c88c99e052aef7a2a703e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org >
2016-07-05 10:46:44 +00:00
Kai Koehne
8ccf739ae0
README: Update Windows build requirements
...
Change-Id: I9e29d0728db35f65822aff9d709cd93a6b3b7ab2
Task-number: QTBUG-54084
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2016-07-04 07:39:52 +00:00
Kai Koehne
828c7e9e4e
README: Qt 5.7 requires C++11 compliant compiler
...
Task-number: QTBUG-54084
Change-Id: I127fe637791f05f8310988a4c09fc9584e194f53
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2016-07-04 07:39:50 +00:00
Qt Submodule Update Bot
acf5c9d0ff
Updated submodules
...
Change-Id: Ie27b2f6daddc68e72b09d779beaf1f61a8a29aa6
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-07-02 20:55:05 +00:00
Qt Submodule Update Bot
f7ef3ff7f0
Updated submodules
...
Change-Id: Ib7650cfe43602d9337ed7892af9a6649a6dd2f6f
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-07-01 09:31:12 +00:00
Qt Submodule Update Bot
ca7708f22e
Updated submodules
...
Change-Id: I64b5898838652d6a785a45136947f7d55fa3d3f1
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-06-30 07:46:13 +00:00
Frederik Gladhorn
f4c6a9c97c
Merge "Merge remote-tracking branch 'origin/5.7' into dev" into refs/staging/dev
2016-06-28 15:58:17 +00:00
Qt Submodule Update Bot
f78835e062
Updated submodules.
...
Change-Id: I12a0a7f2f8174541a1d3c572478c3d0fb765a35d
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io >
2016-06-28 15:58:12 +00:00
Liang Qi
39a03d3d6a
Merge remote-tracking branch 'origin/5.7' into dev
...
Change-Id: I5ed83c8f42be099c545dfdcc96a34f7d33cfcda7
2016-06-24 07:10:02 +02:00
Qt Submodule Update Bot
3727ce11ac
Updated submodules.
...
Change-Id: Icb8aad2382e3106db016485d404d7e8afc987399
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-06-23 20:08:48 +00:00
Qt Submodule Update Bot
e06238e996
Updated submodules.
...
Change-Id: I5a29cb5e04135debd8e7293594eb540e6acd23dd
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org >
2016-06-21 14:08:07 +00:00
Liang Qi
e205785b5c
Merge remote-tracking branch 'origin/5.6' into 5.7
...
Change-Id: I2e0204f745b482e4faa210ec7f8b95463267b3ca
2016-06-20 21:35:34 +02:00
Frederik Gladhorn
8ddc3c1254
Add script to patch QNX SDK headers for Qt atomics
...
Applies http://www.qnx.com/download/feature.html?programid=27555
to the QNX SDK on our continuous integration machines.
Change-Id: I6d24b5024b3e5981c30bbf9a26a1bb4dfaca4e80
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com >
2016-06-16 08:40:11 +00:00
Liang Qi
bbe0a01fde
Merge remote-tracking branch 'origin/5.6' into 5.7
...
Change-Id: I4a97d7f5b12f9f5e082c44dea279e39417ccf1c4
2016-06-14 20:25:20 +02:00
Qt Submodule Update Bot
4f64747383
Updated submodules.
...
Change-Id: If1195243a052f8cd20079345dbc7b2783e7bf459
Reviewed-by: Liang Qi <liang.qi@qt.io >
2016-06-11 07:42:47 +00:00
Liang Qi
e568a942ec
Merge remote-tracking branch 'origin/5.7.0' into 5.7
...
Conflicts:
.gitmodules
Change-Id: Ibb7ae7927cfd3371bdb77d88df409e6982e43985
2016-06-10 12:32:03 +02:00
Qt Submodule Update Bot
6a4d5e4bc8
Updated submodules.
...
Change-Id: Ia6457dbccce18d960274b0a1774c3d646dfbc6b9
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io >
2016-06-07 17:59:57 +00:00
Qt Submodule Update Bot
801066c40d
Updated submodules.
...
Change-Id: If3be9830f7bdbb5508e3b3a962afcc7402b433b2
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io >
2016-06-03 06:24:37 +00:00
Qt Submodule Update Bot
e96f60a228
Updated submodules.
...
Change-Id: I5093e1ed41b58628b9a67e3bc8c9ed737c9e5523
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io >
2016-05-30 10:07:21 +00:00
Qt Submodule Update Bot
4e02d96116
Updated submodules.
...
Change-Id: I89a5dc174641a9e4fc7c99e31794c92575179c49
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io >
2016-05-30 08:13:51 +00:00
Qt Submodule Update Bot
0c66994ae9
Updated submodules.
...
Change-Id: Ia44a5bc2e6e42cd00524dc82c01d5f59726475f3
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org >
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io >
2016-05-28 07:36:05 +00:00
Simon Hausmann
ad474f110f
Fix status of qtquick1 and enginio
...
The right term is "ignore" in order to ignore the module, not "ignored".
Change-Id: Idd4a887834fc98fffb2b9e8385308aa676ba3adf
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io >
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com >
2016-05-26 23:13:14 +00:00
Jani Heikkinen
30f22b8351
Set qtquick and enginio to ignored state
...
It was agreed at the Qt Contributor Summit 2015 that QtQuick1 will be
removed completely from the packages and not even compiled during
qt5.git integration.
Enginio is also removed from 5.7.0 so ignoring it as well
Change-Id: I80ac88d28f811fbf731e33d4d4353a249ad6d29a
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
2016-05-24 11:53:12 +00:00
Qt Submodule Update Bot
4ace6667f2
Updated submodules.
...
Change-Id: I32a473f951d4c00b98263d570ebadbd368fa78ce
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io >
2016-05-18 19:18:50 +00:00
Oswald Buddenhagen
23824d231b
Adjust submodule branches
...
Change-Id: I3457cdb3ec2a645fb542039a62e6d107e1bbb812
2016-05-13 13:28:52 +02:00
Oswald Buddenhagen
777967f97b
Merge remote-tracking branch 'origin/5.6' into 5.7
...
skipped all sha1 updates.
Change-Id: I1f741cf7bea806ab238b4f1b5585bb440dafd4f7
2016-05-13 13:22:16 +02:00
Qt Submodule Update Bot
868e545eb2
Updated submodules.
...
Change-Id: Iac472068ce186e1e1a0a8a58c7050451171eee37
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org >
2016-05-11 18:54:26 +00:00
Frederik Gladhorn
cef159accd
Add script to install freeopcua on Ubuntu 14.04
...
Change-Id: Ia13362cf9aa17fbc0e85ac61b1f2897101903aaf
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com >
2016-05-06 10:43:53 +00:00
Frederik Gladhorn
3afd172a25
Merge remote-tracking branch 'origin/5.6' into 5.7
...
Change-Id: If598cf5987b52450a43fab93702b717c96b17ad2
2016-04-28 12:25:11 +02:00
Qt Submodule Update Bot
b7c2e9a846
Updated submodules.
...
Change-Id: Id24e1017eee9828e7d6245f1241f241662cc48ef
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org >
2016-04-21 05:55:42 +00:00
Iikka Eklund
3df0a5837c
Update qtquickcontrols2 status as "addon" for Qt 5.7
...
qtquickcontrols2 is not in preview state anymore for Qt 5.7.
Change-Id: Ib9d3616e7605beabb9bb9f0b0cb1b79a8d499ebd
Reviewed-by: J-P Nurmi <jpnurmi@qt.io >
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com >
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com >
2016-04-21 05:55:37 +00:00
Dominik Holland
a9752d68ed
Added qtdeclarative and qtmultimedia as optional dependencies for qtspeech
...
Change-Id: I20602133a2156b162e99432f868e4925469c7ff5
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com >
2016-04-13 14:00:38 +00:00
Qt Submodule Update Bot
e23b244494
Updated submodules.
...
Change-Id: I875e16060956af433e20acff4fbdcfb54d0d9923
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org >
2016-04-13 14:00:35 +00:00
Qt Submodule Update Bot
273e5b82cf
Updated submodules.
...
Change-Id: Idc9529f02cc9a5ad4cd300a745b559fea9c94ed4
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com >
2016-04-11 06:57:46 +00:00
Jani Heikkinen
7251401281
Update 5.7 module status
...
In Qt 5.7 enginio is obsolete and Qt3D addon, not TP anymore
Change-Id: I019f76162cfcc853b542695245a983f151f1b072
Reviewed-by: Iikka Eklund <iikka.eklund@theqtcompany.com >
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com >
Reviewed-by: Sean Harmer <sean.harmer@kdab.com >
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com >
2016-04-11 06:57:42 +00:00
Liang Qi
5758a88e59
Merge remote-tracking branch 'origin/5.6' into 5.7
...
Conflicts:
.gitmodules
Change-Id: If63e4f4f7d9a7ddba01d4e621fe6bfbc60838d26
2016-04-05 09:52:18 +02:00
Qt Submodule Update Bot
a550ad21bf
Updated submodules.
...
Change-Id: I1c0bcd2c582276c04e44e88169807cc7cf5b43c3
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com >
2016-04-04 07:23:53 +00:00
Qt Submodule Update Bot
d9beab9abd
Updated submodules.
...
Change-Id: Ie0c625f6a48fe8d05150bd12f4d92beb2a359ec7
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com >
2016-03-29 04:19:17 +00:00
Qt Submodule Update Bot
20dcf55e7d
Updated submodules.
...
Change-Id: I5622046dbc1f8eee0cda929627fb8873d525b02a
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com >
2016-03-08 18:24:09 +00:00
Qt Submodule Update Bot
53b920dc69
Updated submodules.
...
Change-Id: I94c3646dc3309f71f577c6f41241cb2570d0c598
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com >
2016-03-03 10:05:02 +00:00
BogDan Vatra
534d63e652
QQC2 doesn't depend on QQC1
...
QQC2 depends on qtgraphicaleffects.
Change-Id: I6cc53d46cf9f4a140dff570801f13556da0d3961
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com >
2016-02-28 06:41:54 +00:00
Qt Submodule Update Bot
e785abbec1
Updated submodules.
...
Change-Id: Id60487a24eb193207d4d8837a91cef1abc19f97f
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com >
2016-02-25 18:49:52 +00:00
Qt Submodule Update Bot
211080722e
Updated submodules.
...
Change-Id: I633ba6875269578aae2f9d28062d3fa78924a5fc
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com >
2016-02-24 15:41:25 +00:00
Simon Hausmann
30236c3f15
Merge "Merge remote-tracking branch 'origin/5.6' into 5.7" into refs/staging/5.7
2016-02-24 15:41:16 +00:00
BogDan Vatra
18e84e7c06
Enable QtGamepad usage in Qt3D
...
If Qt3D finds QtGamepad, it will use it to build gamepad support.
Change-Id: Ifbc40e5e04a6030d25c2d429878d4fb3a3dd11a6
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com >
2016-02-22 12:40:29 +00:00
Simon Hausmann
d4bb786963
Merge remote-tracking branch 'origin/5.6' into 5.7
...
Change-Id: I2bc1389ece7f12efc334f0292edbbea837f9adc2
2016-02-19 09:21:52 +01:00
Qt Submodule Update Bot
3fa8726fa7
Updated submodules.
...
Change-Id: I5861620b6214dc5ff124672ce21dd4dd5b25ce85
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com >
2016-02-15 06:57:00 +00:00
Oswald Buddenhagen
81523d838c
Adjust submodule branches
...
Change-Id: I3484da8952951d818e9f584bf9b57e9bb9b1e430
2016-02-12 17:40:00 +01:00
Qt Submodule Update Bot
7a8c874231
Updated submodules.
...
Change-Id: I6901259b7a01e57d0c8ca2a9f40d9501635f5cc0
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com >
2016-02-12 11:11:07 +00:00
Simon Hausmann
e52c7efa4c
Fix datavis3d dependencies
...
The qtmultimedia dependency was missing for datavis3d.
Change-Id: I91007c210e58aa9985844a8234781356391bfbad
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com >
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com >
2016-02-12 11:11:01 +00:00
Oswald Buddenhagen
c6d04d68bd
add qtgamepad, qtscxml, and qtspeech
...
Change-Id: I14bc475d44367a9102e896976eba5bd191ee232d
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com >
2016-02-12 11:10:57 +00:00
Miikka Heikkinen
2c53e3d08c
Add charts, data visualization and virtual keyboard modules
...
Change-Id: I53cbc4ce3c2e44687ce454498f5def820614db85
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com >
2016-01-25 14:41:07 +00:00
Qt Submodule Update Bot
b93073ecc9
Updated submodules.
...
Change-Id: I790e982492004e93953bed503a1d777d27c28b6f
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com >
2016-01-23 11:12:30 +00:00
Simon Hausmann
d758a3b055
Merge remote-tracking branch 'origin/5.6' into dev
...
Change-Id: I62519dfde84c16a7dfe1b6f225e40e6f16d3105c
2016-01-22 10:42:38 +01:00
Simon Hausmann
d2b26ede9c
Updated submodules.
...
Change-Id: I5d7279982a017ef903991faa89c79ca10e717497
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com >
2015-12-17 21:01:44 +00:00
Liang Qi
2051c2987e
Enable qtpurchasing by default
...
Change-Id: I4030b9f446a865e758492e2f07b8adb19052e91d
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com >
2015-12-16 20:08:35 +00:00
Liang Qi
c485f3e4a7
Manually update qtpurchasing
...
Change-Id: I7385116d7c6e9a7f9b7b2be4b76468b8459299dd
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com >
2015-12-16 09:38:11 +00:00
Liang Qi
7b30d85bdc
Merge remote-tracking branch 'origin/5.6' into dev
...
Change-Id: Ibd5caf0448c9eba9251bc9395fe647f1955743f0
2015-12-15 19:05:02 +01:00
Liang Qi
e4ff528bb6
Updated submodules.
...
Change-Id: I54527e1c5ad138ac63d38d8eabcf158d11b0286d
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com >
2015-12-15 12:13:58 +00:00
Qt Submodule Update Bot
a2a6cf11a7
Updated submodules.
...
Change-Id: I1d3966833b5f27fb262f2d3727557ef2c8947828
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com >
2015-09-21 18:02:48 +00:00
Oswald Buddenhagen
2068af50ca
Merge remote-tracking branch 'origin/5.6' into dev
...
Conflicts:
.gitmodules
qtquickcontrols2
qtwebview
Change-Id: Ic5b78f36511d5e022aacd6ade5d052345bc84d14
2015-09-18 12:00:07 +02:00
