Commit Graph

1495 Commits

Author SHA1 Message Date
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
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
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
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
Simon Hausmann
8a60455e61 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>
2016-12-21 11:32:28 +00: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>
v5.8.0-rc1
2016-12-20 09:19:36 +00:00
Simo Fält
ff1ad70a19 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>
2016-12-19 21:39:35 +00:00
Simo Fält
fc6717cf23 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>
2016-12-19 21:39:26 +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
Heikki Halmet
e86ba9e1f7 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>
2016-12-16 14:44:55 +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
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
Simon Hausmann
16d05b088e 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>
2016-12-08 08:18:56 +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
Jędrzej Nowacki
0ce4f02c5f 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>
2016-12-07 13:48:24 +00:00
Simon Hausmann
be37958406 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>
2016-12-07 13:47:48 +00:00
Simon Hausmann
3718450891 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>
2016-12-07 13:47:46 +00:00
Frederik Gladhorn
d0552ebf2d 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>
2016-12-07 13:47:42 +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
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
Oswald Buddenhagen
150071b395 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>
2016-11-30 15:12:13 +00:00
Oswald Buddenhagen
977f0841e4 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>
2016-11-30 15:12:07 +00:00
Liang Qi
75f605743c Update submodules on '5.6' in qt5
Change-Id: I88a559589ffd21c7436df6c644c92db21244860d
Reviewed-by: Liang Qi <liang.qi@qt.io>
2016-11-30 12:22:14 +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
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
b74a26b980 Update submodules on '5.6' in qt5
Change-Id: Id212d3e785bef2ca0aa0d9fad3b7933369626643
Reviewed-by: Liang Qi <liang.qi@qt.io>
2016-11-26 10:23:43 +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
Frederik Gladhorn
a7c6550fff Add basic Ubuntu 16.04 provisioning
Change-Id: Iaae5bb295bfd48cc5bc036baef9b0fa899d393ef
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2016-11-25 11:05:49 +00:00
Liang Qi
a2762b0f57 Update submodules on '5.6' in qt5
Change-Id: I65e6b60cdc03f25d050854c68220fa96ee140bf6
Reviewed-by: Liang Qi <liang.qi@qt.io>
2016-11-25 05:25:56 +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