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
This commit is contained in:
Simon Hausmann
2017-01-14 08:40:10 +01:00
82 changed files with 2336 additions and 78 deletions

6
.gitmodules vendored
View File

@@ -11,7 +11,7 @@
status = addon
[submodule "qtdeclarative"]
depends = qtbase
recommends = qtsvg qtxmlpatterns
recommends = qtxmlpatterns
path = qtdeclarative
url = ../qtdeclarative.git
branch = dev
@@ -100,7 +100,7 @@
status = addon
[submodule "qtsensors"]
depends = qtbase
recommends = qtdeclarative
recommends = qtdeclarative qtsvg
path = qtsensors
url = ../qtsensors.git
branch = dev
@@ -160,7 +160,7 @@
status = addon
[submodule "qtquick1"]
depends = qtscript
recommends = qtsvg qtxmlpatterns
recommends = qtxmlpatterns
path = qtquick1
url = ../qtquick1.git
branch = dev