Commit Graph

2136 Commits

Author SHA1 Message Date
Qt Submodule Update Bot
a7ebfbda72 Update submodules on 'dev' in qt5
Change-Id: Ic5a5a6acb55c5d5bac5ef7146c12c699a2b99948
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2017-12-29 11:40:27 +00:00
Lars Knoll
62efcd0c0a Temporarily remove two platforms from the qt5.git build
This is required to get a qt5.git update through, where we're having
a catch22 problem. Current qtbase in qt5.git gives compile errors on
some of the tested platforms, while qtdeclarative has test failures
due to (correct) changes in qtbase. So we can't merge the fix for
declarative without updating qt5.git, and we can't update qt5.git
without having that fix merged.

Change-Id: I87f79f6312a6ee2226aeb7b6868fd280ab087bcc
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
2017-12-29 11:40:12 +00:00
Joni Jantti
66f9718ebb Provisioning: Clean and move Win8 mqtt scripts to Win8.1
mqtt scripts need to be moved to Windows 8.1 directory from Windows 8.

Change-Id: Idc1b116f608e8cc8ae0a37713661d35b55b26a3a
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-12-27 11:29:37 +00:00
Joni Jantti
dc0d045c17 Provisioning: Move open62541 from RHEL 7.2 to RHEL 7.4
5.10 -> dev merge switched from RHEL 7.2 to 7.4 and the open62541
provisioning script was left behind to the RHEL 7.2 provisioning
directory.

Task-number: QTQAINFRA-1666
Change-Id: I5c325dae63cb14a9935ddce5f3f751bd62df0ba2
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
2017-12-27 11:29:35 +00:00
Tony Sarajärvi
357de3ea13 Drop QNX 6.6.0 verification from the CI
Task-number: QTQAINFRA-1378
Change-Id: Icc5fb21b6430c916ceecb8d5a504d40938931b06
Reviewed-by: Simo Fält <simo.falt@qt.io>
2017-12-27 11:29:31 +00:00
Liang Qi
730e2c9b0b Revert "Temporarily disable android build on macOS 10.12"
Bring android build on macOS back.

This reverts commit b6249e89fa.

Task-number: QTQAINFRA-1660
Change-Id: I510894cf6bdc7089fea140e3702e5246a6617787
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-12-21 16:55:12 +00:00
Simo Fält
5df4ec2ec9 Fix Android provisioning script
We have to accept extra license to enable installing all required
packages.

Task-number: QTQAINFRA-1660
Change-Id: Ifae45ce36b5739cea5124eae04e08472ebe9414a
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-12-21 16:55:09 +00:00
Liang Qi
ba6ae3be9a Revert "Temporarily ignore qtcanvas3d"
QtCanvas3D adapted to new internal api in qtdeclarative.

This reverts commit 146bda6468.

Task-number: QTBUG-64766
Change-Id: I709cb8856b674edc1a7d3217fdf68cbe8aca1608
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2017-12-20 08:17:41 +00:00
Liang Qi
6b7ee9a8f0 Update qtcanvas3d only
Task-number: QTBUG-64766
Change-Id: I2ae55f0f4e38ffb98964f960c323334a9049936f
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2017-12-20 08:17:38 +00:00
Liang Qi
b6249e89fa Temporarily disable android build on macOS 10.12
Need to be re-enabled when correct fix landed.

Task-number: QTQAINFRA-1660
Change-Id: Ifefb019016322ebf2e7c4ec9320e58555c6918e0
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2017-12-20 06:39:05 +00:00
Liang Qi
146bda6468 Temporarily ignore qtcanvas3d
qtdeclarative changed internal API.

Task-number: QTBUG-64766
Change-Id: I7a0bbcaf121bf852fc028be275e82a5658c132a0
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-12-20 06:39:02 +00:00
Liang Qi
b5e287b93b Update submodules on 'dev' in qt5
Change-Id: Ia91b548e08a7d84f47116b79265618ff9d4d8005
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-12-20 06:38:58 +00:00
Liang Qi
def11da274 Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
	coin/platform_configs/qt5.txt

Change-Id: I9ad5a004544bf2f368ee1aaad247c4db3b36b162
2017-12-14 11:49:07 +01:00
Heikki Halmet
44eaaf374a Install command line tools for osx 10.11 and macOS 10.12
Command line tools is needed by homebrew when installing p7zip

Task-number: QTBUG-64729
Change-Id: I2f9ce5a094ffe4d07e8bd138c0dcc150d0d916e0
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit beb73056c3)
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-12-12 16:51:39 +00:00
Liang Qi
eccfaf1f50 Merge remote-tracking branch 'origin/5.9' into 5.10
Change-Id: Ica3e7340f572140020318c6e22397fad393f9b15
2017-12-11 12:11:51 +01:00
Liang Qi
91df8a3a8f Fix syntax error - not use comma in platform_configs
ammends d9f2fe1b7f

Task-number: QTQAINFRA-1636
Change-Id: I92d0af1c62f4c6da92fce1a00d7a2b60055ce8dd
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-12-11 10:00:50 +00:00
Qt Submodule Update Bot
e067ea2a72 Update submodules on '5.9' in qt5
Change-Id: Ib3d4ff60bd232362ca0cf1ad455f09c83643387d
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-12-11 05:46:41 +00:00
Allan Sandfeld Jensen
35db81f33e Add NSS to RHEL 7.4
Needed by QtWebEngine

Change-Id: I66a737457cb9dd5f2cc53d64f639037926a560ca
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry-picked from 9a9d798ce4)
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
2017-12-10 12:56:35 +00:00
Liang Qi
c2c45640e0 Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
	coin/platform_configs/qt5.txt
	coin/provisioning/common/install-commandlinetools.sh
	coin/provisioning/qtci-linux-RHEL-7.4-x86_64/004-install-packages.sh

Change-Id: I3b20cda2b35412fd708295e4f9e32cd2d7d638fb
2017-12-09 23:09:15 +01:00
Joni Jantti
828f82b6f0 Add missing name prefixes for Win7 provision scripts
The prefix numbers were missing for Ruby and QNX patch scripts.

Change-Id: I687b244c4657e17c32f0cc8221d3fb0ad3c5578d
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-12-09 18:48:26 +00:00
Tony Sarajärvi
74dd14ae83 Remove provisioning scripts from non existing platform
Change-Id: I01ecb0a9d4050b88fc5010f5a31baa6e776c1848
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
2017-12-09 18:48:21 +00:00
Joni Jäntti
77fdde0de9 RHEL7.4: install packages in one yum instance
Currently we are opening and closing a yum instance for every package
we install during provisioning. This is a bit inefficient so it's
better to install them in one go.

Task-number: QTQAINFRA-1586
Change-Id: Idbf814f9023da0fe8213b2ed84cd1a27a149fc27
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-12-09 18:48:15 +00:00
Joni Jäntti
5089c4468f Fix mesa_llvmpipe provisioning script for x64 Windows
This script doesn't extract the dll to System32 on a x64 system.
Calling "sysnative" doesn't seem to work with the custom function being
used.

Change-Id: Iea734a400d8c095ea2e3fe54f38e4756fba406f9
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-12-09 18:48:11 +00:00
Heikki Halmet
b12a1591c4 Provisioning: Install signing tools to Windows
Signing tools are needed when signing offline installers

Change-Id: I98f12e3fdf01d273dff5fda0c2e34707174c6eae
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-12-09 18:48:05 +00:00
Qt Submodule Update Bot
a0e1f4f480 Update submodules on '5.10' in qt5
Change-Id: I428bbebe2b5e86e6ed7150080ab3ced2a6077fb8
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-12-09 13:48:21 +00:00
Liang Qi
7d04dc1a29 Move INTEGRITY build from qt5 to default
Many failures in qtbase on INTEGRITY happened recently.

Change-Id: Ic55259e694961a53199d30f095159728207f8824
Reviewed-by: Kimmo Ollila <kimmo.ollila@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-12-08 20:05:59 +00:00
Liang Qi
d9f2fe1b7f Add b2qt developer build for qtbase
Because we had enabled this for qtdeclarative before.

Change-Id: I1efd438ebf51b2e632d3f8f39bd707e7eb5a282e
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-12-08 20:05:56 +00:00
Tony Sarajärvi
5d9e2c49d1 Update ICC compiler from 2018 to 2018 update 1
Change-Id: I2e44c98114afe559e4490d9b9ec3e1d19d7f4696
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-12-08 20:05:54 +00:00
Heikki Halmet
b6a1fc6aae Install command line tools for osx 10.11 and macOS 10.12
Command line tools is needed by homebrew when installing p7zip

Task-number: QTBUG-64729
Change-Id: Ia13838e3f5845351cb682c7d25127c8f36172d3b
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit beb73056c3)
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-12-08 10:53:42 +00:00
Liang Qi
8ab923d0e5 Update submodules on '5.9' in qt5
Change-Id: I5f68733c3c00ae4c2d1d23898552c1d2f91dee14
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-12-05 07:36:21 +00:00
Liang Qi
1f4d727570 Merge remote-tracking branch 'origin/5.10.0' into 5.10
Change-Id: I8d8c6b21a68caf28913934141f6b1f98be0ff369
2017-12-04 14:17:33 +01:00
Qt Submodule Update Bot
f8712c099d Update submodules on '5.10' in qt5
Change-Id: Ifd29751e627dbefb3f93c5f3ce4ff2cfec5d59fb
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2017-12-03 15:43:51 +00:00
Heikki Halmet
adcdf7b49f Provisioning: Install Devtoolset-4 to Rhel 7.4
Gcc need to be downgraded from 6 to 5, because Gcc 6 is too new for
the latest Ubuntu LTS (16.04). This means Devtoolset-4 need to be used
instead of Devtoolset-6.

Task-number: QTBUG-64820
Change-Id: I2601aaaff5f3bbbadd867105fd4155239ab89825
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
v5.10.0 v5.10.0-rc3
2017-12-01 17:55:19 +00:00
Qt Submodule Update Bot
6e54086be5 Update submodules on '5.10.0' in qt5
Change-Id: I398ac279c6a6065e12c953ae129cfcc98e37388a
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2017-12-01 07:03:38 +00:00
Qt Submodule Update Bot
60f02cdfae Update submodules on '5.9' in qt5
Change-Id: I133cfe933eb47073931c183fa56c540c06471ad6
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-11-30 21:51:44 +00:00
Qt Submodule Update Bot
2b7b098700 Update submodules on '5.10' in qt5
Change-Id: I88c38e77cad31acd45bb0ffea14fbfee48d5ee4c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2017-11-30 09:35:36 +00:00
Qt Submodule Update Bot
6d37fda8c1 Update submodules on '5.9' in qt5
Change-Id: I9938183f8c87a6bd34989c37045b5df8803b15d0
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-11-30 05:01:05 +00:00
Heikki Halmet
cdbd177b41 Provisioning: Install bluez-libs-devel
bluez-libs-devel is needed to enable Qt Bluetooth

Task-number: QTBUG-64782
Change-Id: Ie668a44463307c7089bb96a087acab04c27dd3a0
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-11-30 05:00:51 +00:00
Tony Sarajärvi
92a7d95947 Fix indentation in platform configurations
Change-Id: Id4a7bec02b0ee1156e80667538a29ca2baf4cfed
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2017-11-30 05:00:39 +00:00
Heikki Halmet
f1db104ff9 Provisioning: Install bluez-libs-devel
bluez-libs-devel is needed to enable Qt Bluetooth

Task-number: QTBUG-64782
Change-Id: Ie668a44463307c7089bb96a087acab04c27dd3a0
(cherry picked from commit 9b722f9df91c4f7a6ca24d3ad18e68e3a76b137b)
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
v5.10.0-rc2
2017-11-29 15:25:35 +00:00
Qt Submodule Update Bot
ed0f440974 Update submodules on '5.10.0' in qt5
Change-Id: I97468b13eeba051ff2c59162dfb3855a2c8e838e
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2017-11-29 15:25:32 +00:00
Edward Welbourne
6675a8f416 Add missing shbang to cmake provisioning script
It was given execute permissions when renamed recently; but the
bash-isms in it will only work with that if it uses bash.

Change-Id: I61468257210ba586fdaf1e79531bae0492f9e8ae
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-11-29 12:03:31 +00:00
Qt Submodule Update Bot
eb3b287df1 Update submodules on '5.10' in qt5
Change-Id: I49d2ac31b572687781d8b1006f64206f57f3890a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2017-11-27 07:15:37 +00:00
Qt Submodule Update Bot
8baf4c994e Update submodules on '5.10.0' in qt5
Change-Id: I305d3f429ad7cc3650c26640b4da6077afc796af
Reviewed-by: Liang Qi <liang.qi@qt.io>
v5.10.0-rc1
2017-11-26 02:00:31 +00:00
Heikki Halmet
beb73056c3 Install command line tools for osx 10.11 and macOS 10.12
Command line tools is needed by homebrew when installing p7zip

Task-number: QTBUG-64729
Change-Id: Ia13838e3f5845351cb682c7d25127c8f36172d3b
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2017-11-26 02:00:23 +00:00
Liang Qi
bc16944191 Merge remote-tracking branch 'origin/5.9.3' into 5.10.0
Conflicts:
	.gitmodules
	coin/provisioning/qtci-linux-RHEL-7.4-x86_64/mqtt_broker.sh

Change-Id: I3bfaa9531a4b62426ec276c764ffda5cffcbdcaa
2017-11-25 16:40:50 +01:00
Qt Submodule Update Bot
fdfe9e05ba Update submodules on '5.10' in qt5
Change-Id: Ibcd840cc4135dc1860facbe2176555662eabc55a
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-11-25 15:37:24 +00:00
Allan Sandfeld Jensen
9a9d798ce4 Add NSS to RHEL 7.4
Needed by QtWebEngine

Change-Id: Ieed87170eccc288523bc966dab1a25025c37abfa
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2017-11-25 13:26:30 +00:00
Qt Submodule Update Bot
f60bc7aa9d Update submodules on '5.10' in qt5
Change-Id: I76ddfac0ffac176a5d63b83bf13c4bacac8babbe
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2017-11-24 06:46:36 +00:00
Qt Submodule Update Bot
f113a65c6e Update submodules on '5.10' in qt5
Change-Id: Ib454b91cd68ec6c109fe007b6667771a006ee95c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2017-11-23 17:28:14 +00:00