mirror/qt/qt5.git
3 years agoImprove Postgresql installation on Windows
Simon Hausmann [Mon, 8 May 2017 12:28:56 +0000 (14:28 +0200)]
Improve Postgresql installation on Windows

Similar to the mysql change (parent commit) it's faster to rename any
older artifacts and install only what we need. This also generalizes the
zip archive extraction code for "dev" packages.

Change-Id: I3ad1f23efaed80fab3e0778a3e8c46317138f1ad
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
3 years agoImprove mysql installation
Simon Hausmann [Mon, 8 May 2017 10:15:40 +0000 (12:15 +0200)]
Improve mysql installation

* Instead of deleting the files from a previous installation, which will
  not actually release any disk space but just make the qcow2 file
  larger, let's just rename the directory the old files are in.
  That is a significantly faster operation.
* When extracting the zip archive, only extract what we need for Qt:
  Libraries, binaries and headers. We can skip the installation of
  several thousand documentation files for example, which takes a long
  time.
* Instead of downloading the zip archive via PowerShell's
  Invoke-WebRequest we can get the data much faster using CopyItem off
  the CIFS share. As a bonus this is also more robust against download
  failures.

Change-Id: I9128bd70e5f4a4ebcdbf046765e76b63bad033a5
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
3 years agoUpdate submodules on '5.6' in qt5
Qt Submodule Update Bot [Sat, 3 Jun 2017 16:52:30 +0000 (19:52 +0300)]
Update submodules on '5.6' in qt5

Change-Id: I436caf993701906de211398fe51ce4d2882ad5a0
Reviewed-by: Liang Qi <liang.qi@qt.io>
3 years agoUpdate submodules on '5.6' in qt5
Qt Submodule Update Bot [Sun, 28 May 2017 18:14:57 +0000 (20:14 +0200)]
Update submodules on '5.6' in qt5

Change-Id: I0d0ee51f8952a7739b16f37ae526c14f44fb2ec7
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
3 years agoMSVC 2017 updated and missing component for winrt arm
Heikki Halmet [Tue, 2 May 2017 18:25:34 +0000 (21:25 +0300)]
MSVC 2017 updated and missing component for winrt arm

MSVC 2017 and Build Tools updated to version 15.1. Also missing
component 'Visual C++ compilers and libraries for ARM' installed
for winrt arm

Also script added to storage msvc version numbers to versions.txt

Change-Id: I015e15d5d613b178c1266a2aecee5c3270780486
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
3 years agoget rid of custom 'qt' gitmodules property
Oswald Buddenhagen [Thu, 8 Dec 2016 14:46:06 +0000 (15:46 +0100)]
get rid of custom 'qt' gitmodules property

instead, re-use the (also custom) 'project' property with the magic
value '-' to flag modules which contain no project files at all.

Change-Id: I33163c098852e1b79ad698115aac98217efe1157
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
3 years agoUpdate submodules on '5.6' in qt5
Qt Submodule Update Bot [Wed, 26 Apr 2017 18:11:25 +0000 (20:11 +0200)]
Update submodules on '5.6' in qt5

Change-Id: Iadc5070366d65f98c81af02f4926c2ebfb1ae294
Reviewed-by: Liang Qi <liang.qi@qt.io>
3 years agoImprove Android SDK/NDK installation on macOS
Simon Hausmann [Mon, 24 Apr 2017 08:34:21 +0000 (10:34 +0200)]
Improve Android SDK/NDK installation on macOS

* Remove unused installation on macOS 10.10 as we only build packages
  on 10.11.

* Replace the use of the ~1GB downloads of the zip files with a direct
  extraction via NFS. This is more resilient to flakyness in the network
  connection.

Change-Id: I1bfe5bbf00a6614233b517801daf130069094ec9
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
3 years agoProvisioning: MSVC 2017 Build Tools
Heikki Halmet [Wed, 19 Apr 2017 09:23:20 +0000 (12:23 +0300)]
Provisioning: MSVC 2017 Build Tools

MSVC 2017 build tools are pre-provisioned to windows 10 templates

Change-Id: I98d857101ad209acd6eea9f821e367e514359d8c
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
3 years agoignore submodules in dirtiness check
Oswald Buddenhagen [Wed, 12 Apr 2017 11:38:02 +0000 (13:38 +0200)]
ignore submodules in dirtiness check

changed submodule sha1s should not prevent updating.

Change-Id: Ibd4480bed91de2a04719c32c95a4c603eda4c44b
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
3 years agoUpdate submodules on '5.6' in qt5
Qt Submodule Update Bot [Fri, 21 Apr 2017 18:11:40 +0000 (20:11 +0200)]
Update submodules on '5.6' in qt5

Change-Id: Ic7e8b19d68ab1adb24604230e64e40353de11bd7
Reviewed-by: Liang Qi <liang.qi@qt.io>
3 years agoUpdate submodules on '5.6' in qt5
Qt Submodule Update Bot [Thu, 13 Apr 2017 18:12:37 +0000 (20:12 +0200)]
Update submodules on '5.6' in qt5

Change-Id: I30e320be0c03efc38d0ede024f5678e3a9c4d307
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
3 years agoProvisioning: Change tier1 templates for Windows 10
Heikki Halmet [Wed, 12 Apr 2017 11:25:31 +0000 (14:25 +0300)]
Provisioning: Change tier1 templates for Windows 10

These tier 1 templates includes changes needed by 5.9, but we can use
these same tier 1 templates for 5.6 also

Change-Id: I3ad0d75ab89f7b6502b758fb94f984cc6e0b7f16
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
3 years agoFix provision help script DownloadURL.sh
Tony Sarajärvi [Mon, 10 Apr 2017 04:58:49 +0000 (07:58 +0300)]
Fix provision help script DownloadURL.sh

The script neglected the result of the sha1 after download.
Even with a failure it exited nicely.

Change-Id: I6c0e25c2b764a0ad54acbe317eddf395a56d7f1c
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
3 years agoserialize build of qtwebkit and qtwebengine
Oswald Buddenhagen [Mon, 6 Feb 2017 19:48:22 +0000 (20:48 +0100)]
serialize build of qtwebkit and qtwebengine

linking both at the same time requires more than my 16GB of RAM, so
introduce a .gitmodules field which serializes the two.
in practice, it is just interpreted as an optional dependency. the CI
system won't be taught about it, so this will not cause an unnecessary
serialization there.

Change-Id: I938537ebd3767a1184a5a31c4c026c70a05d499a
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
3 years agofix url normalization
Oswald Buddenhagen [Mon, 27 Mar 2017 14:01:31 +0000 (16:01 +0200)]
fix url normalization

after 8c0390143, we cannot rely on the denormalized segment starting
with a slash any more.

Task-number: QTBUG-59753
Change-Id: Ia3a3c005d1f41320747a60efc48a180caa88206b
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Valentin Fokin <fokinv@inf.u-szeged.hu>
3 years agoUpdate submodules on '5.6' in qt5
Qt Submodule Update Bot [Wed, 5 Apr 2017 18:11:14 +0000 (20:11 +0200)]
Update submodules on '5.6' in qt5

Change-Id: I89f138e0d359d429864351172c5d7cdc6475590c
Reviewed-by: Liang Qi <liang.qi@qt.io>
3 years agoUpdate submodules on '5.6' in qt5
Qt Submodule Update Bot [Sat, 1 Apr 2017 13:31:18 +0000 (15:31 +0200)]
Update submodules on '5.6' in qt5

Change-Id: I31ee5d48a4cdf6d7a28f9ec7b19c87b04f4b4e06
Reviewed-by: Liang Qi <liang.qi@qt.io>
3 years agoProvisioning: Bug fix patch for msvc 2015 update 3
Heikki Halmet [Thu, 30 Mar 2017 11:05:16 +0000 (14:05 +0300)]
Provisioning: Bug fix patch for msvc 2015 update 3

This bug fix patch is needed for QtWebEngine

Change-Id: Id2c624461fbe27d9fd12a149281cae324bf8b14e
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
3 years agoCoin provisioning: Use arg instead of autodetecting architecture
Simo Fält [Mon, 27 Feb 2017 13:04:41 +0000 (15:04 +0200)]
Coin provisioning: Use arg instead of autodetecting architecture

When provisioning windows machine, it seems that detecting architecture
by checking [System.Environment]::Is64BitProcess doesn't work properly.
Instead pass 32 or 64 as an argument when calling powershell script.

Change-Id: I890ad141b8ef194275848d0e656431753463cd2b
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
3 years agoProvisioning: Move Visual Studio installation to pre-provisioning
Heikki Halmet [Fri, 17 Mar 2017 11:34:17 +0000 (13:34 +0200)]
Provisioning: Move Visual Studio installation to pre-provisioning

Visual Studios will be pre-provisioned to tier1/vanilla os when visual
studio update is needed. Even if using pre-configured offline
installer with specific workload and components the installation is
still taking too long. This way we'll reduce provisioning time
significantly

Change-Id: I1f831aef648716dc640ce9cbfb4e63aa54e7afd0
Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
3 years agoUpdate submodules on '5.6' in qt5
Liang Qi [Fri, 17 Mar 2017 19:03:02 +0000 (20:03 +0100)]
Update submodules on '5.6' in qt5

Change-Id: I8050d2b9f1f2d3ad55f64c139410abc09f21dc6e
Reviewed-by: Liang Qi <liang.qi@qt.io>
3 years agoReflect current URL in example comment
Jason Erb [Tue, 14 Mar 2017 02:46:23 +0000 (22:46 -0400)]
Reflect current URL in example comment

Change-Id: I51091c69d2698ba23207a95d17f4748c22cd7cb7
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
3 years agoUpdate submodules on '5.6' in qt5
Liang Qi [Tue, 14 Mar 2017 19:02:54 +0000 (20:02 +0100)]
Update submodules on '5.6' in qt5

Change-Id: Ibb0fac8d2a36e6aeeb25aa91bb1a74403005205b
Reviewed-by: Liang Qi <liang.qi@qt.io>
3 years agoRemove init-repository assumption of repo url “…/qt/<repo>”
Jason Erb [Tue, 7 Mar 2017 23:08:11 +0000 (18:08 -0500)]
Remove init-repository assumption of repo url “…/qt/<repo>”

Task-number: QTBUG-59355
Change-Id: I7bc2c94f13c6cf43bd9d4472f18b3b769e75954b
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
3 years agoProvision: Storage icu version to versions.txt
Heikki Halmet [Fri, 3 Feb 2017 11:02:29 +0000 (13:02 +0200)]
Provision: Storage icu version to versions.txt

~/versions.txt will be used to storage sw version information

Change-Id: Ia84e0fc55f5bbcf4afd902ce601556defcc565a0
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
3 years agoUpdate submodules on '5.6' in qt5
Liang Qi [Thu, 23 Feb 2017 19:02:11 +0000 (20:02 +0100)]
Update submodules on '5.6' in qt5

Change-Id: I6676715446aa572b96f4abe7d3d8932817bfaed1
Reviewed-by: Liang Qi <liang.qi@qt.io>
3 years agoUpdate submodules on '5.6' in qt5
Liang Qi [Fri, 10 Feb 2017 19:01:22 +0000 (20:01 +0100)]
Update submodules on '5.6' in qt5

Change-Id: I2b0758eeb79aedf3450e857fc3e29de6d3659d47
Reviewed-by: Liang Qi <liang.qi@qt.io>
3 years agoProvisioning: Update opengl32.dll x86 on Windows 10 x64
Akseli Salovaara [Mon, 30 Jan 2017 08:29:06 +0000 (10:29 +0200)]
Provisioning: Update opengl32.dll x86 on Windows 10 x64

OpenGL32 update is needed for autotests to pass.
At least tst_qglbuffer vertexBuffer will fail without an update.
This update is already in place on Windows x86 and x64 CI hosts but
applied only to System32 -folders.

Change-Id: I223ffc53ecba77030385f29463c419acdc12e1a3
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
3 years agoProvisioning: Install postgresql x86 and x64 libraries to Windows 10
Akseli Salovaara [Thu, 15 Dec 2016 07:14:25 +0000 (09:14 +0200)]
Provisioning: Install postgresql x86 and x64 libraries to Windows 10

Install both x86 and x64 libraries in order to enable Windows x86
builds on Windows x64 hosts. Environment variables are used by Coin.

Change-Id: Ied654efb2f33ab1c643f38a1ea50a127aeb7af7e
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
3 years agoProvisioning: Install OpenSSL x86 and x64 libraries to Windows 10 x64
Akseli Salovaara [Thu, 15 Dec 2016 07:11:48 +0000 (09:11 +0200)]
Provisioning: Install OpenSSL x86 and x64 libraries to Windows 10 x64

Install both x86 and x64 libraries in order to enable Windows x86
builds on Windows x64 hosts. Environment variables are used by Coin.

Change-Id: Idada7fc41202298c6f1b2919f0f4343b717e890a
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
3 years agoProvisioning: Install MySQL x86 and x64 libraries to Windows10 x64
Akseli Salovaara [Thu, 15 Dec 2016 07:05:11 +0000 (09:05 +0200)]
Provisioning: Install MySQL x86 and x64 libraries to Windows10 x64

Install both x86 and x64 libraries in order to enable Windows x86
builds on Windows x64 hosts. Environment variables are used by Coin.

Change-Id: I8eea51a0bfd05bc72d1d004649211c7bc5901d97
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
3 years agoProvisioning: Visual Studio 2015 with update 3
Heikki Halmet [Thu, 26 Jan 2017 11:17:19 +0000 (13:17 +0200)]
Provisioning: Visual Studio 2015 with update 3

Common install script for Visual Studio installation and
updates. Latest Visual Studio 2015 update is required
for releases

Change-Id: I5b41625ca7f161b4ba2d417797f8839ef175cdbc
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
3 years agoUpgrade CMake to 3.6.2
Konstantin Tokarev [Wed, 28 Sep 2016 10:07:43 +0000 (13:07 +0300)]
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>
(cherry picked from commit 77eeee64a43c5c448321b8f5ac7b64c872e14489)

3 years agoUpgrade CMake to 3.6.2 on Windows 7 builder
Konstantin Tokarev [Sun, 6 Nov 2016 19:44:29 +0000 (22:44 +0300)]
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>
(cherry picked from commit daa865312104e7d5d073b0a63e0f50c8a04b9697)

3 years agoUpgrade CMake to 3.6.2 on Windows 8
Simo Fält [Mon, 6 Feb 2017 08:55:06 +0000 (10:55 +0200)]
Upgrade CMake to 3.6.2 on Windows 8

Pyside requires CMake 3.0 or higher

Change-Id: Ic3f7eb4e89cd022364b1437fa8ff4476c86c3e47
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
3 years agoProvision: Storage android sdk and ndk version information
Heikki Halmet [Tue, 10 Jan 2017 07:59:14 +0000 (09:59 +0200)]
Provision: Storage android sdk and ndk version information

Sdk and ndk version information will be storaged to versions.txt.
Versions.txt will be used for all provision scripts and later on it's
data will be printed to provision log.

Also script name changed to match both android sdk and ndk.

Change-Id: I3366e596f539099c3b587466d90905d0889398fe
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
3 years agoProvision: Script to print sw versions to provision log
Heikki Halmet [Tue, 10 Jan 2017 13:26:57 +0000 (15:26 +0200)]
Provision: Script to print sw versions to provision log

This script is the last script that is run by provisioning. It will
print all storaged sw information to provision log

Change-Id: I2c76d5f7cccf9c116cb660ffcb67d3bece473da8
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
3 years agoUpdate jom to 1.1.2
Joerg Bornemann [Tue, 22 Nov 2016 09:45:09 +0000 (10:45 +0100)]
Update jom to 1.1.2

The most important changes that affect the CI are:
  - Fixed bogus path in error message for failed targets.
  - Fixed error "JobClient destroyed while still acquiring."
    that could be yielded for failed builds.
  - Fixed /k option (QTCREATORBUG-17131).
  - Added the special .NOTPARALLEL target that disables parallel
    build for the containing makefile. (This one is needed to
    build QtWebEngine in debug-and-release properly.)
  - Introduced the JOMFLAGS environment variable.
    This is a MAKEFLAGS pendant. JOMFLAGS is useful to set up
    separate flags for nmake and jom.

Change-Id: Icb2462d06b000a3fe29e1e9290b294cb1e900409
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
3 years agoRevert "Clean up usage of qtsvg as dependency"
Frederik Gladhorn [Mon, 16 Jan 2017 13:21:47 +0000 (14:21 +0100)]
Revert "Clean up usage of qtsvg as dependency"

qtdeclarative has a runtime dependency, some tests rely on the svg
module being available, so in order to not reduce the test coverage,
revert this change.
I'd like to see a better/cleaner separation, but for the time being,
better coverage wins.

This reverts commit fbd782636b6ee413d2b6e8bca408263297194254.

Change-Id: I60d6b585e25e2e7c4f6ad705b754279968827842
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
3 years agoProvision: Script for linux to remove preinstalled software
Heikki Halmet [Thu, 2 Feb 2017 07:07:50 +0000 (09:07 +0200)]
Provision: Script for linux to remove preinstalled software

Script to remove tier1's preinstalled software. Script itself includes
all information about the software that needs to be removed from tier2
before provision starts to run installations. When this script is run
for certain platform that platform needs to provision all removed
software back to tier2 template. So user needs to make sure that all
needed provision script are available when calling this removal-script.
Goal is to have vanilla os when provision don't need to remove any
software before installations. When this goal is reached this script
and script calls can be removed from provision.

Change-Id: I048909800807fabb1dc599e768a90e7457fbc2cf
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
3 years agoAndroid sdk and ndk to provisioning for Windows 7
Heikki Halmet [Wed, 25 Jan 2017 08:12:36 +0000 (10:12 +0200)]
Android sdk and ndk to provisioning for Windows 7

Installs latest Android sdk and ndk.
It also runs update for SDK API level 18, latest SDK- and platform-
tools and build-tools version 23.0.3.

Task-number: QTBUG-58369
Change-Id: Ib42f5149243fc5d262f6542e26726d1c8cbb2e8c
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
3 years agoProvision: Set bash_profile to read .bashrc
Heikki Halmet [Thu, 19 Jan 2017 09:49:24 +0000 (11:49 +0200)]
Provision: Set bash_profile to read .bashrc

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.

Change-Id: I417ecd7866bc4ae1b50beb14c19b456588b4050a
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
3 years agoAdd Android NDK/SDK to provision for macOS 10.10 and 10.11
Heikki Halmet [Wed, 7 Sep 2016 06:17:07 +0000 (09:17 +0300)]
Add Android NDK/SDK to provision for macOS 10.10 and 10.11

Install latest Android sdk and ndk.
It also runs update for SDK API level 18

Task-number: QTBUG-58370
Change-Id: I1bf8cb42dd3e753be27fa9fcd2c1ac8ccbdb87c3
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
3 years agoUpdate submodules on '5.6' in qt5
Liang Qi [Sat, 21 Jan 2017 11:31:34 +0000 (12:31 +0100)]
Update submodules on '5.6' in qt5

Change-Id: I57bbccaf30143e1ca8b56ca31a229b007111a34f
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
3 years agoUpdate submodules on '5.6' in qt5
Liang Qi [Sun, 15 Jan 2017 19:00:40 +0000 (20:00 +0100)]
Update submodules on '5.6' in qt5

Change-Id: Ie8aa9fd84a4b85c280831771c261b621238c9bf4
Reviewed-by: Liang Qi <liang.qi@qt.io>
3 years agoUpdate submodules on '5.6' in qt5
Liang Qi [Wed, 11 Jan 2017 19:00:55 +0000 (20:00 +0100)]
Update submodules on '5.6' in qt5

Change-Id: I5599c7876c25f21fb286013a2d8cccda5efebe02
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
3 years agoAdd CI build configurations
Simon Hausmann [Wed, 11 Jan 2017 10:59:43 +0000 (11:59 +0100)]
Add 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
Change-Id: I7ce48e3b15da757166eeac7531478d3746c8aa7f
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
3 years agoProvision: Cmake 3.6.2
Heikki Halmet [Mon, 7 Nov 2016 08:13:22 +0000 (10:13 +0200)]
Provision: Cmake 3.6.2

Red Hat 6.6 needs cmake for GammaRay
OpenSUSE 42.1 and Ubuntu 14.04 needs cmake for pyside

Change-Id: I64b25be70057b86be7bfc96fb07446f7727bbefe
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
3 years agoAdd provision helper file to install compressed packages
Tony Sarajärvi [Thu, 24 Nov 2016 11:21:33 +0000 (13:21 +0200)]
Add provision helper file to install compressed packages

Change-Id: I6a7e1af7c91bd11a0cc6379f8bb7762acf42eae5
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
3 years agoAdd DownloadURL.sh provisioning helper script
Tony Sarajarvi [Mon, 10 Oct 2016 08:55:31 +0000 (11:55 +0300)]
Add DownloadURL.sh provisioning helper script

Change-Id: I64bef8470555e33772b72847aa76e0e9b4720696
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
3 years agoAdd provisioning try-catch helper script for bash
Tony Sarajarvi [Fri, 7 Oct 2016 09:12:59 +0000 (12:12 +0300)]
Add provisioning try-catch helper script for bash

Change-Id: Ia61e503ed5315546421fdeb2f4b8b1be37dab3e9
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
3 years agoImprove build performance on Windows
Simon Hausmann [Thu, 29 Dec 2016 18:47:22 +0000 (19:47 +0100)]
Improve build performance on Windows

Disable the windows search indexing service, which has a tendency to start
indexing source code archives that we've just extracted. We are not interested
in this service.

Change-Id: I1d3f5178a035bc951499d993641a9315db9712ca
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
3 years agoProvisioning: Disable Windows Defender
Simo Fält [Thu, 5 Jan 2017 15:17:56 +0000 (17:17 +0200)]
Provisioning: Disable Windows Defender

This will reduct the timeouts coin has had recently with win machines.

Change-Id: I32118f226194a3ea5e3c85d24103ec8341925d3c
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
3 years agoRemove shutdown "helpers" for macOS
Simon Hausmann [Thu, 15 Dec 2016 09:31:03 +0000 (10:31 +0100)]
Remove shutdown "helpers" for macOS

It turns out that they don't quite work the way we expected them to, and
instead we Coin is going to shut down the VMs directly at the right
time.

Change-Id: I9f7a6f2f898002a25544fc513a0c2414fcd5c263
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
3 years agoProvision: Install pyside python dependencies to Windows
Simo Fält [Tue, 13 Dec 2016 07:00:12 +0000 (09:00 +0200)]
Provision: Install pyside python dependencies to Windows

To test successfully pyside dependencies with Coin, we need
python virtual env.

Change-Id: I59c620b7da9c78d2b5c55e233d75597b747a8e84
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
3 years agoProvision: Install pyside python dependencies to Linux
Simo Fält [Tue, 13 Dec 2016 06:51:24 +0000 (08:51 +0200)]
Provision: Install pyside python dependencies to Linux

To test successfully pyside dependencies with Coin, we need
python-dev packages and virtual env.

Change-Id: I29a5eed769798da4e4799eb5ccdff1cd032070d5
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
3 years agoProvision: Android openssl 1.0.2j for Windows 7
Heikki Halmet [Fri, 16 Dec 2016 12:17:04 +0000 (14:17 +0200)]
Provision: Android openssl 1.0.2j for Windows 7

We are currently using too old openssl for Android builds in Windows 7.
Openssl version need to be at least 1.0.1.

This script will configure openssl 1.0.2j for Android using tools
from msys.

Change-Id: I9ab9a3b4f9f3953cf99bf15fee631f5a7961b42d
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
3 years agoImprove disabling of screensaver on macOS
Simon Hausmann [Thu, 8 Dec 2016 07:18:50 +0000 (08:18 +0100)]
Improve disabling of screensaver on macOS

Setting the idleTime on currentHost works well, until the hardware UUID changes
and thus the host ID for the setting. With kvm that happens quite frequently,
with vmware less but also occasionally (deep clone for example). By disabling
the screensaver on start-up we can cover all cases quite easily.

Change-Id: Ibdcf404430656f9caa47386ca3c732366ddfc8c7
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
3 years agoSuppress shutdown indicator in Ubuntu
Jędrzej Nowacki [Mon, 5 Dec 2016 13:03:56 +0000 (14:03 +0100)]
Suppress shutdown indicator in Ubuntu

We want to quit machines without being asked, if we are
really sure.

Change-Id: Ic7156f5b0fe236c0270d8c2e4fcc322a82776caf
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
3 years agoDisable the screensaver on macOS definitely and permanently
Simon Hausmann [Wed, 7 Dec 2016 13:09:25 +0000 (14:09 +0100)]
Disable the screensaver on macOS definitely and permanently

Change-Id: I8856eebfe91b9e1cc2cc318a1e7ea80348f1486e
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
3 years agoFix paths for provisioning on macOS
Simon Hausmann [Mon, 5 Dec 2016 15:21:46 +0000 (16:21 +0100)]
Fix paths for provisioning on macOS

The directory names were missing the architecture, otherwise the content was
unused.

Change-Id: I0316da5c4b1352012f27ce330c3319a8aedf01ea
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
3 years agoFix macOS provisioning not shutting down cleanly
Frederik Gladhorn [Tue, 6 Dec 2016 17:59:10 +0000 (18:59 +0100)]
Fix macOS provisioning not shutting down cleanly

After provisioning we want the machine to be sensibly shut down since we
will use the disk image later. VSphere doesn't manage to shut down 10.8
VMs. Help out by calling shutdown.
For the other OS X/macOS versions, this is also desirable since
controlling the power state of these machines is hard with different
virtualization solutions (we're looking at OpenNebula/KVM).

Change-Id: Ieabc14f9c8c1af9421a0ef91dd670f4790a84461
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
3 years agodon't fail to check out some modules in pinned mode
Oswald Buddenhagen [Fri, 25 Nov 2016 19:07:05 +0000 (20:07 +0100)]
don't fail to check out some modules in pinned mode

when used without the --branch option, we clone with --no-checkout, to
avoid unnecessarily checking out files twice when the recorded sha1
doesn't happen to be the tip of the default branch. however, that would
leave the index in a dirty state which would make the subsequent
submodule update abort at some point, silently.

to deal with the problem, we ignore this type of index dirtyness and use
submodule update with --force.

Task-number: QTBUG-57289
Change-Id: I6fc9693b0eaadfb04d2d80f9c8f1f2e11be47ae9
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
3 years agorefuse to operate with dirty submodules
Oswald Buddenhagen [Fri, 25 Nov 2016 19:03:24 +0000 (20:03 +0100)]
refuse to operate with dirty submodules

the operation would later error out anyway, after spending a lot of time
fetching the remotes, and leaving a partially updated state behind.

Change-Id: Ib2a688e446a9bd4ba3b15fc73082224433c18388
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
3 years agoUpdate submodules on '5.6' in qt5
Liang Qi [Tue, 29 Nov 2016 11:39:00 +0000 (12:39 +0100)]
Update submodules on '5.6' in qt5

Change-Id: I88a559589ffd21c7436df6c644c92db21244860d
Reviewed-by: Liang Qi <liang.qi@qt.io>
3 years agoUpdate submodules on '5.6' in qt5
Liang Qi [Fri, 25 Nov 2016 19:00:45 +0000 (20:00 +0100)]
Update submodules on '5.6' in qt5

Change-Id: Id212d3e785bef2ca0aa0d9fad3b7933369626643
Reviewed-by: Liang Qi <liang.qi@qt.io>
3 years agoAdd basic Ubuntu 16.04 provisioning
Frederik Gladhorn [Thu, 17 Nov 2016 13:41:33 +0000 (14:41 +0100)]
Add basic Ubuntu 16.04 provisioning

Change-Id: Iaae5bb295bfd48cc5bc036baef9b0fa899d393ef
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
3 years agoUpdate submodules on '5.6' in qt5
Liang Qi [Thu, 24 Nov 2016 19:00:44 +0000 (20:00 +0100)]
Update submodules on '5.6' in qt5

Change-Id: I65e6b60cdc03f25d050854c68220fa96ee140bf6
Reviewed-by: Liang Qi <liang.qi@qt.io>
3 years agoUpdate submodules on '5.6' in qt5
Liang Qi [Tue, 22 Nov 2016 19:00:46 +0000 (20:00 +0100)]
Update submodules on '5.6' in qt5

Change-Id: I885a6ee78c480bda7f325a21d73d3f95863f9ad4
Reviewed-by: Liang Qi <liang.qi@qt.io>
3 years agoProvision OPENSSL env variable for openSUSE 13.1
Tony Sarajärvi [Mon, 21 Nov 2016 11:10:52 +0000 (13:10 +0200)]
Provision OPENSSL env variable for openSUSE 13.1

Fix building on OpenSuse after openssl update.
Every linux distro seems to patch openssl in a different way to deal with
broken/outdated SSL issues. We seem unable to detect what suse did when
running configure, so this is a stop-gap measure.

Change-Id: I5e375e9c5c1615358dbce0b8dd91476cb4f4e45b
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
3 years agoUpdate submodules on '5.6' in qt5
Liang Qi [Sun, 20 Nov 2016 19:00:41 +0000 (20:00 +0100)]
Update submodules on '5.6' in qt5

Change-Id: I73b32ee6ef5a643c78bb297230fb675a5a3dd64f
Reviewed-by: Liang Qi <liang.qi@qt.io>
3 years agoUpdate submodules on '5.6' in qt5
Liang Qi [Thu, 17 Nov 2016 17:50:57 +0000 (18:50 +0100)]
Update submodules on '5.6' in qt5

Change-Id: I6635f499760dbd4b58e0c65150c886b64ece8391
Reviewed-by: Liang Qi <liang.qi@qt.io>
3 years agoUpdate submodules on '5.6' in qt5
Qt Submodule Update Bot [Tue, 15 Nov 2016 18:02:47 +0000 (20:02 +0200)]
Update submodules on '5.6' in qt5

Change-Id: Ieda66165e735256fa25f335804f54d3574bdcd25
Reviewed-by: Liang Qi <liang.qi@qt.io>
3 years agoproduce less ugly paths to the commit template in submodules
Oswald Buddenhagen [Mon, 17 Oct 2016 09:30:48 +0000 (11:30 +0200)]
produce less ugly paths to the commit template in submodules

Change-Id: I7ebf3c46088e193c8f4605532c1f4a1b6d62d230
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
3 years agoadd --no-fetch option
Oswald Buddenhagen [Mon, 17 Oct 2016 09:15:04 +0000 (11:15 +0200)]
add --no-fetch option

there is no point in re-fetching all repositories just because an update
failed due to local modifications.

Change-Id: Ie9883586d77f3310058353844f0bbcfb0b775ebb
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
3 years agoUpdate submodules on '5.6' in qt5
Qt Submodule Update Bot [Fri, 11 Nov 2016 12:26:39 +0000 (14:26 +0200)]
Update submodules on '5.6' in qt5

Change-Id: Ib475bf7c1fcab721cc884313a6c9dd1426a46ad6
Reviewed-by: Liang Qi <liang.qi@qt.io>
3 years agofix cloning of tagged versions
Oswald Buddenhagen [Wed, 2 Nov 2016 17:59:19 +0000 (18:59 +0100)]
fix cloning of tagged versions

the .gitmodules of tagged commits typically refers to a release branch
which was deleted shortly after the release. consequently, git clone
--branch is bound to fail.

of course, cloning a fixed sha1/tag requires no branch in the first
place, so revert back to using git clone --no-checkout in that case.

amends ac6168c0c.

Task-number: QTBUG-49133
Change-Id: Ica032f1d07a70ad89f16b23bdf5cdab785612fdc
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
3 years agoUpdate submodules on '5.6' in qt5
Qt Submodule Update Bot [Fri, 4 Nov 2016 08:47:28 +0000 (10:47 +0200)]
Update submodules on '5.6' in qt5

Change-Id: Ic9d3ad8264dfc543f8bac4bda81b82c7f92fe176
Reviewed-by: Liang Qi <liang.qi@qt.io>
3 years agoUpdate submodules on '5.6' in qt5
Qt Submodule Update Bot [Thu, 3 Nov 2016 07:02:05 +0000 (09:02 +0200)]
Update submodules on '5.6' in qt5

Change-Id: I3f4f3b15e3528c319c1479759282571759477faf
Reviewed-by: Liang Qi <liang.qi@qt.io>
3 years agoClean up usage of qtsvg as dependency
Frederik Gladhorn [Wed, 19 Oct 2016 10:06:20 +0000 (12:06 +0200)]
Clean up usage of qtsvg as dependency

There is no build dependency on QtSvg in qtdeclarative or qtquick1, so
don't recommend it for builds. QtSensors on the other hand has an
example that does need svg.
This does not change anything in the big picture, the svg module will be
built as always and svg files will be displayed. The change is the
ordering of builds (leave more room for parallelization).

Change-Id: I50e527e03a75742036d5f914611d0b34437a8e3a
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
3 years agoUpdate submodules on '5.6' in qt5
Qt Submodule Update Bot [Sun, 30 Oct 2016 11:12:37 +0000 (13:12 +0200)]
Update submodules on '5.6' in qt5

Change-Id: Ib4bc5819e056a5571967aa9919d5a092834c28a7
Reviewed-by: Liang Qi <liang.qi@qt.io>
3 years agoUpdate submodules on '5.6' in qt5
Qt Submodule Update Bot [Fri, 28 Oct 2016 18:23:05 +0000 (21:23 +0300)]
Update submodules on '5.6' in qt5

Change-Id: I4ef33095de23bbf2878f796e036ad6fd5e7d69df
Reviewed-by: Liang Qi <liang.qi@qt.io>
3 years agoUpdate submodules on '5.6' in qt5
Qt Submodule Update Bot [Thu, 27 Oct 2016 11:58:33 +0000 (14:58 +0300)]
Update submodules on '5.6' in qt5

Change-Id: I4ecaec417836737c4d428dbfe69261666d1330eb
Reviewed-by: Liang Qi <liang.qi@qt.io>
3 years agoUpdate submodules on '5.6' in qt5
Qt Submodule Update Bot [Fri, 21 Oct 2016 18:10:58 +0000 (21:10 +0300)]
Update submodules on '5.6' in qt5

Change-Id: Iefe7bd1ea3f99dee7503a8ae2bc62ce965121029
Reviewed-by: Liang Qi <liang.qi@qt.io>
3 years agoUpdate submodules on '5.6' in qt5
Qt Submodule Update Bot [Wed, 12 Oct 2016 22:01:04 +0000 (01:01 +0300)]
Update submodules on '5.6' in qt5

Change-Id: Id6ff55fb87154f79a136784c5fe4f63711183fa4
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
3 years agoUpdate submodules on '5.6' in qt5
Qt Submodule Update Bot [Mon, 10 Oct 2016 22:00:58 +0000 (01:00 +0300)]
Update submodules on '5.6' in qt5

Change-Id: I62cae7b521df5e7c9073c3361017a74d3355a1e0
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
3 years agoUpdate submodules on '5.6' in qt5
Qt Submodule Update Bot [Sat, 8 Oct 2016 22:00:39 +0000 (01:00 +0300)]
Update submodules on '5.6' in qt5

Change-Id: Iefa745df986d2794dfdcb7454733122334d5192c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
3 years agoUpdate submodules on '5.6' in qt5
Qt Submodule Update Bot [Fri, 7 Oct 2016 17:10:22 +0000 (20:10 +0300)]
Update submodules on '5.6' in qt5

Change-Id: I186da5a92032e37abcfbaa96e393f2dd2304d181
Reviewed-by: Liang Qi <liang.qi@qt.io>
3 years agoMerge remote-tracking branch 'origin/5.6.2' into 5.6
Liang Qi [Fri, 30 Sep 2016 12:36:23 +0000 (14:36 +0200)]
Merge remote-tracking branch 'origin/5.6.2' into 5.6

Conflicts:
.gitmodules

Change-Id: Ifffec3df90687a6ad84547bb0f603b0446bf0e9d

3 years agoPython to provisioning for Windows
Heikki Halmet [Fri, 9 Sep 2016 10:12:51 +0000 (13:12 +0300)]
Python to provisioning for Windows

Installs Python version 2.7.10.
Python is required for building Qt 5 from source. More
specifically qtdeclarative and qtwebkit require it.

Change-Id: I63c8f3294a8a4799df5e52fbd41a36db8686950e
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
4 years agoUpdate submodules on '5.6' in qt5
Qt Submodule Update Bot [Mon, 26 Sep 2016 22:00:49 +0000 (01:00 +0300)]
Update submodules on '5.6' in qt5

Change-Id: I76cd6f71dd61e2478b73d39163e7fbe4b8f6afe6
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
4 years agoUpdate submodules on '5.6.2' in qt5 5.6.2 v5.6.2
Qt Submodule Update Bot [Sun, 25 Sep 2016 09:17:01 +0000 (12:17 +0300)]
Update submodules on '5.6.2' in qt5

Change-Id: I337a9d4897efe57d3ac09d9981bb2b07f96a9d87
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
4 years agoUpdate submodules on '5.6' in qt5
Qt Submodule Update Bot [Sat, 24 Sep 2016 22:00:49 +0000 (01:00 +0300)]
Update submodules on '5.6' in qt5

Change-Id: Ifa9a8c1e59cf8e286c4a52b6936720da76f92073
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
4 years agoUpdate submodules on '5.6' in qt5
Qt Submodule Update Bot [Fri, 23 Sep 2016 20:33:36 +0000 (23:33 +0300)]
Update submodules on '5.6' in qt5

Change-Id: I66d3689ab56b1b8b1c754ced12456ff7e86052f7
Reviewed-by: Liang Qi <liang.qi@qt.io>
4 years agoUpdate submodules on '5.6.2' in qt5
Qt Submodule Update Bot [Fri, 23 Sep 2016 05:10:38 +0000 (08:10 +0300)]
Update submodules on '5.6.2' in qt5

Change-Id: I47372eb19e0f038e1ec1999a183125ed1c5300c7
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
4 years agoUpdate submodules on '5.6' in qt5
Qt Submodule Update Bot [Sat, 17 Sep 2016 20:51:23 +0000 (23:51 +0300)]
Update submodules on '5.6' in qt5

Change-Id: Id7fba5c79f44c2081ed49ce8f7050b8eacfb76ef
Reviewed-by: Liang Qi <liang.qi@qt.io>
4 years agoUpdate submodules on '5.6.2' in qt5
Qt Submodule Update Bot [Fri, 16 Sep 2016 06:53:09 +0000 (09:53 +0300)]
Update submodules on '5.6.2' in qt5

Change-Id: I623adf43a36ff5cd8de844ae533063523efe2b02
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
4 years agoUpdate submodules on '5.6' in qt5
Qt Submodule Update Bot [Mon, 12 Sep 2016 22:00:57 +0000 (01:00 +0300)]
Update submodules on '5.6' in qt5

Change-Id: Id80b5734e19aa6f15d90b11abef9f9c183290292
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
4 years agoAdd Qt Android Extras as dependency for Qt Purchasing
Eskil Abrahamsen Blomfeldt [Tue, 13 Sep 2016 10:19:30 +0000 (12:19 +0200)]
Add Qt Android Extras as dependency for Qt Purchasing

Change-Id: Ia7b9d966777470642e0ee0ad3e9c82496ce93950
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>