Update submodules on '5.8.0' in qt5

Change-Id: Ib32e222f05e3af71d9f194683ba57f792343924d
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>

.gitmodules

@@ -1,66 +1,66 @@
 [submodule "qtbase"]
 	path = qtbase
 	url = ../qtbase.git
-	branch = 5.7
+	branch = 5.8.0
 	status = essential
 [submodule "qtsvg"]
 	depends = qtbase
 	path = qtsvg
 	url = ../qtsvg.git
-	branch = 5.7
+	branch = 5.8.0
 	status = addon
 [submodule "qtdeclarative"]
 	depends = qtbase
 	recommends = qtxmlpatterns
 	path = qtdeclarative
 	url = ../qtdeclarative.git
-	branch = 5.7
+	branch = 5.8.0
 	status = essential
 [submodule "qtactiveqt"]
 	depends = qtbase
 	path = qtactiveqt
 	url = ../qtactiveqt.git
-	branch = 5.7
+	branch = 5.8.0
 	status = addon
 [submodule "qtscript"]
 	depends = qtbase
 	recommends = qttools
 	path = qtscript
 	url = ../qtscript.git
-	branch = 5.7
+	branch = 5.8.0
 	status = deprecated
 [submodule "qtmultimedia"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtmultimedia
 	url = ../qtmultimedia.git
-	branch = 5.7
+	branch = 5.8.0
 	status = essential
 [submodule "qttools"]
 	depends = qtbase
 	recommends = qtdeclarative qtactiveqt qtwebkit
 	path = qttools
 	url = ../qttools.git
-	branch = 5.7
+	branch = 5.8.0
 	status = essential
 [submodule "qtxmlpatterns"]
 	depends = qtbase
 	path = qtxmlpatterns
 	url = ../qtxmlpatterns.git
-	branch = 5.7
+	branch = 5.8.0
 	status = addon
 [submodule "qttranslations"]
 	depends = qttools
 	path = qttranslations
 	url = ../qttranslations.git
-	branch = 5.7
+	branch = 5.8.0
 	status = essential
 	priority = 30
 [submodule "qtdoc"]
 	depends = qtdeclarative
 	path = qtdoc
 	url = ../qtdoc.git
-	branch = 5.7
+	branch = 5.8.0
 	status = essential
 	priority = 40
 [submodule "qtrepotools"]
@@ -74,7 +74,7 @@
 	recommends = qtdeclarative qtlocation qtmultimedia qtsensors qtwebchannel qtxmlpatterns
 	path = qtwebkit
 	url = ../qtwebkit.git
-	branch = 5.7
+	branch = 5.8.0
 	status = obsolete
 	project = WebKit.pro
 	priority = 20
@@ -82,7 +82,7 @@
 	depends = qtwebkit qttools
 	path = qtwebkit-examples
 	url = ../qtwebkit-examples.git
-	branch = 5.7
+	branch = 5.8.0
 	status = obsolete
 [submodule "qtqa"]
 	depends = qtbase
@@ -93,17 +93,17 @@
 	priority = 50
 [submodule "qtlocation"]
 	depends = qtbase
-	recommends = qtdeclarative qtquickcontrols qtserialport qtsystems
+	recommends = qtdeclarative qtquickcontrols qtserialport
 	path = qtlocation
 	url = ../qtlocation.git
-	branch = 5.7
+	branch = 5.8.0
 	status = addon
 [submodule "qtsensors"]
 	depends = qtbase
 	recommends = qtdeclarative qtsvg
 	path = qtsensors
 	url = ../qtsensors.git
-	branch = 5.7
+	branch = 5.8.0
 	status = addon
 [submodule "qtsystems"]
 	depends = qtbase
@@ -136,177 +136,184 @@
 	recommends = qtdeclarative qtandroidextras
 	path = qtconnectivity
 	url = ../qtconnectivity.git
-	branch = 5.7
+	branch = 5.8.0
 	status = addon
 [submodule "qtwayland"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtwayland
 	url = ../qtwayland.git
-	branch = 5.7
+	branch = 5.8.0
 	status = addon
 [submodule "qt3d"]
 	depends = qtdeclarative qtimageformats
 	recommends = qtgamepad
 	path = qt3d
 	url = ../qt3d.git
-	branch = 5.7
+	branch = 5.8.0
 	status = addon
 [submodule "qtimageformats"]
 	depends = qtbase
 	path = qtimageformats
 	url = ../qtimageformats.git
-	branch = 5.7
+	branch = 5.8.0
 	status = addon
 [submodule "qtquick1"]
 	depends = qtscript
 	recommends = qtxmlpatterns
 	path = qtquick1
 	url = ../qtquick1.git
-	branch = 5.7
+	branch = dev
 	status = ignore
 [submodule "qtgraphicaleffects"]
 	depends = qtdeclarative
 	path = qtgraphicaleffects
 	url = ../qtgraphicaleffects.git
-	branch = 5.7
+	branch = 5.8.0
 	status = addon
 [submodule "qtquickcontrols"]
 	depends = qtdeclarative
 	recommends = qtgraphicaleffects
 	path = qtquickcontrols
 	url = ../qtquickcontrols.git
-	branch = 5.7
+	branch = 5.8.0
 	status = essential
 [submodule "qtserialbus"]
 	depends = qtserialport
 	path = qtserialbus
 	url = ../qtserialbus.git
-	branch = 5.7
-	status = preview
+	branch = 5.8.0
+	status = addon
 [submodule "qtserialport"]
 	depends = qtbase
 	path = qtserialport
 	url = ../qtserialport.git
-	branch = 5.7
+	branch = 5.8.0
 	status = addon
 [submodule "qtx11extras"]
 	depends = qtbase
 	path = qtx11extras
 	url = ../qtx11extras.git
-	branch = 5.7
+	branch = 5.8.0
 	status = addon
 [submodule "qtmacextras"]
 	depends = qtbase
 	path = qtmacextras
 	url = ../qtmacextras.git
-	branch = 5.7
+	branch = 5.8.0
 	status = addon
 [submodule "qtwinextras"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtwinextras
 	url = ../qtwinextras.git
-	branch = 5.7
+	branch = 5.8.0
 	status = addon
 [submodule "qtandroidextras"]
 	depends = qtbase
 	path = qtandroidextras
 	url = ../qtandroidextras.git
-	branch = 5.7
+	branch = 5.8.0
 	status = addon
 [submodule "qtenginio"]
 	depends = qtdeclarative
 	path = qtenginio
 	url = ../qtenginio.git
-	branch = 5.7
+	branch = dev
 	status = ignore
 [submodule "qtwebsockets"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtwebsockets
 	url = ../qtwebsockets.git
-	branch = 5.7
+	branch = 5.8.0
 	status = addon
 [submodule "qtwebchannel"]
 	depends = qtbase
 	recommends = qtdeclarative qtwebsockets
 	path = qtwebchannel
 	url = ../qtwebchannel.git
-	branch = 5.7
+	branch = 5.8.0
 	status = addon
 [submodule "qtwebengine"]
 	depends = qtquickcontrols qtwebchannel
 	recommends = qtlocation
 	path = qtwebengine
 	url = ../qtwebengine.git
-	branch = 5.7
+	branch = 5.8.0
 	status = addon
 	priority = 10
 [submodule "qtcanvas3d"]
 	depends = qtdeclarative
 	path = qtcanvas3d
 	url = ../qtcanvas3d.git
-	branch = 5.7
+	branch = 5.8.0
 	status = addon
 [submodule "qtwebview"]
 	depends = qtdeclarative
 	recommends = qtwebengine
 	path = qtwebview
 	url = ../qtwebview.git
-	branch = 5.7
+	branch = 5.8.0
 	status = addon
 [submodule "qtquickcontrols2"]
 	depends = qtgraphicaleffects
 	path = qtquickcontrols2
 	url = ../qtquickcontrols2.git
-	branch = 5.7
+	branch = 5.8.0
 	status = addon
 [submodule "qtpurchasing"]
 	depends = qtbase qtandroidextras
 	recommends = qtdeclarative
 	path = qtpurchasing
 	url = ../qtpurchasing.git
-	branch = 5.7
+	branch = 5.8.0
 	status = addon
 [submodule "qtcharts"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtcharts
 	url = ../qtcharts.git
-	branch = 5.7
+	branch = 5.8.0
 	status = addon
 [submodule "qtdatavis3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtdatavis3d
 	url = ../qtdatavis3d.git
-	branch = 5.7
+	branch = 5.8.0
 	status = addon
 [submodule "qtvirtualkeyboard"]
 	depends = qtbase qtdeclarative qtsvg
 	recommends = qtmultimedia qtquickcontrols
 	path = qtvirtualkeyboard
 	url = ../qtvirtualkeyboard.git
-	branch = 5.7
+	branch = 5.8.0
 	status = addon
 [submodule "qtgamepad"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtgamepad
 	url = ../qtgamepad
-	branch = 5.7
+	branch = 5.8.0
 	status = preview
 [submodule "qtscxml"]
 	depends = qtbase qtdeclarative
 	path = qtscxml
 	url = ../qtscxml
-	branch = 5.7
-	status = preview
+	branch = 5.8.0
+	status = addon
 [submodule "qtspeech"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtspeech
 	url = ../qtspeech
-	branch = dev
-	status = ignore
+	branch = 5.8.0
+	status = preview
+[submodule "qtnetworkauth"]
+	depends = qtbase
+	recommends = qtwebview
+	path = qtnetworkauth
+	url = ../qtnetworkauth
+	branch = 5.8.0
+	status = preview

coin/platform_configs/default.txt

@@ -1,24 +1,25 @@
-Template                            Target OS           Target arch     Compiler    Features
------------------------------------ ------------------- --------------- ----------- -----------------------------------------------------------------
-qtci-windows-8-x86_64                                                   MSVC2013    DeveloperBuild Release BuildExamples
-qtci-windows-10-x86_64                                                  MSVC2015    DeveloperBuild Release QtNamespace QtLibInfix
-qtci-windows-8-x86                                                      MSVC2013    Packaging DebugAndRelease Release OpenGLDynamic
-qtci-windows-8-x86_64                                                   MSVC2013    Packaging DebugAndRelease Release OpenGLDynamic
-qtci-windows-7-x86                                                      Mingw53     Packaging DebugAndRelease Release OpenGLDynamic
-qtci-windows-10-x86                                                     MSVC2015    Packaging DebugAndRelease Release OpenGLDynamic
-qtci-windows-10-x86_64                                                  MSVC2015    Packaging DebugAndRelease Release OpenGLDynamic
-qtci-windows-8-x86_64               Windows_Phone_8_1   armv4           MSVC2013    Packaging DebugAndRelease Release DisableTests
-qtci-windows-8-x86_64               WinRT_8_1                           MSVC2013    Packaging DebugAndRelease Release DisableTests
-qtci-linux-Ubuntu-14.04-x86_64                                          GCC         NoWidgets ForceDebugInfo
-qtci-linux-Ubuntu-14.04-x86_64                                          GCC         DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace
-qtci-linux-OpenSuSE-13.01-x86_64                                        GCC         DeveloperBuild NoPch
-qtci-linux-RHEL-6.6-x86_64                                              GCC         Packaging Release NoUseGoldLinker
-qtci-osx-10.10-x86_64                                                   Clang       Packaging DebugAndRelease Release
-qtci-osx-10.9-x86_64                                                    Clang       DeveloperBuild Release QtNamespace NoPch
-qtci-osx-10.8-x86_64                                                    Clang       Release NoFramework
-qtci-linux-RHEL-6.6-x86_64          Android_ANY         armv7           GCC         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
-qtci-linux-Ubuntu-14.04-x86_64      Boot2Qt_Jethro      armv7           GCC         DisableTests
-qtci-linux-Ubuntu-15.04-x86_64      UbuntuTouch_15_04   armv7           GCC         Packaging DisableTests OpenGLES2
-qtci-linux-RHEL-6.6-x86_64          QNX_660             armv7           GCC         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
-qtci-linux-Ubuntu-14.04-x86_64                                          GCC         TestOnly LicenseCheck
-qtci-osx-10.10-x86_64               IOS_ANY             x86_64          Clang       Release DisableTests Static
+Template                            Target OS           Target arch Compiler    Features
+----------------------------------- ------------------- ----------- ----------- -------------------------------------------------------------------------------------
+qtci-windows-8-x86_64                                               MSVC2013    DeveloperBuild Release BuildExamples
+qtci-windows-10-x86_64                                              MSVC2015    DeveloperBuild Release QtNamespace QtLibInfix
+qtci-windows-8-x86                                                  MSVC2013    Packaging DebugAndRelease Release OpenGLDynamic
+qtci-windows-8-x86_64                                               MSVC2013    Packaging DebugAndRelease Release OpenGLDynamic
+qtci-windows-7-x86                                                  Mingw53     Packaging DebugAndRelease Release OpenGLDynamic
+qtci-windows-10-x86                                                 MSVC2015    Packaging DebugAndRelease Release OpenGLDynamic
+qtci-windows-10-x86_64                                              MSVC2015    Packaging DebugAndRelease Release OpenGLDynamic
+qtci-windows-8-x86_64               Windows_Phone_8_1   armv4       MSVC2013    Packaging DebugAndRelease Release DisableTests
+qtci-windows-8-x86_64               WinRT_8_1                       MSVC2013    Packaging DebugAndRelease Release DisableTests
+qtci-linux-Ubuntu-14.04-x86_64                                      GCC         NoWidgets ForceDebugInfo
+qtci-linux-Ubuntu-14.04-x86_64                                      GCC         DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace
+qtci-linux-openSUSE-42.1-x86_64                                     GCC         DeveloperBuild NoPch
+qtci-linux-RHEL-6.6-x86_64                                          GCC         Release
+qtci-linux-RHEL-7.2-x86_64                                          GCC         Packaging Release NoUseGoldLinker
+qtci-osx-10.10-x86_64                                               Clang       Packaging DebugAndRelease Release
+qtci-osx-10.9-x86_64                                                Clang       DeveloperBuild Release QtNamespace NoPch
+qtci-osx-10.9-x86_64                                                Clang       Release NoFramework
+qtci-osx-10.10-x86_64               IOS_ANY             x86_64      Clang       Release DisableTests Static
+qtci-linux-RHEL-6.6-x86_64          Android_ANY         armv7       GCC         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
+qtci-linux-Ubuntu-14.04-x86_64      Boot2Qt_Jethro      armv7       GCC         DisableTests
+qtci-linux-Ubuntu-15.04-x86_64      UbuntuTouch_15_04   armv7       GCC         Packaging DisableTests OpenGLES2
+qtci-linux-RHEL-6.6-x86_64          QNX_660             armv7       GCC         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
+qtci-linux-Ubuntu-14.04-x86_64                                      GCC         TestOnly LicenseCheck

coin/platform_configs/qt5.txt

@@ -1,13 +1,7 @@
 Template                    Target OS           Target arch Compiler    Features
---------------------------- ------------------- ----------- ----------- -----------------------------------------------------------------
-qtci-windows-8-x86_64       Windows_Phone_8_1   x86         MSVC2013    Packaging DebugAndRelease Release DisableTests
+--------------------------- ------------------- ----------- ----------- -------------------------------------------------------------------------------------
 qtci-windows-10-x86_64      WinRT_10            x86         MSVC2015    Packaging DebugAndRelease Release DisableTests
 qtci-windows-10-x86_64      WinRT_10                        MSVC2015    Packaging DebugAndRelease Release DisableTests
-
-# target arch is used here only for documentation the value is ignored
-qtci-windows-10-x86_64      WinRT_10            armv7       MSVC2015    Packaging DebugAndRelease Release DisableTests
-
-# qtci-osx-10.8-x86_64                                      Clang       Release NoFramework
 qtci-linux-RHEL-6.6-x86_64  Android_ANY         x86         GCC         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
 qtci-windows-7-x86          Android_ANY         armv7       Mingw49     Packaging Release DisableTests OpenGLES2
 qtci-windows-7-x86          Android_ANY         x86         Mingw49     Packaging Release DisableTests OpenGLES2
@@ -16,5 +10,8 @@ qtci-osx-10.10-x86_64       Android_ANY         x86         GCC         Packagin
 qtci-linux-RHEL-6.6-x86_64  QNX_660             x86         GCC         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
 qtci-windows-7-x86          QNX_660             armv7       Mingw49     Packaging Release DisableTests OpenGLES2
 qtci-windows-7-x86          QNX_660             x86         Mingw49     Packaging Release DisableTests OpenGLES2
-
+qtci-windows-8-x86_64       Windows_Phone_8_1   x86         MSVC2013    Packaging DebugAndRelease Release DisableTests
 qtci-osx-10.10-x86_64       IOS_ANY             multi       Clang       Packaging DebugAndRelease DisableTests Static
+
+# target arch is used here only for documentation the value is ignored
+qtci-windows-10-x86_64      WinRT_10            armv7       MSVC2015    Packaging DebugAndRelease Release DisableTests

coin/provisioning/qtci-linux-RHEL-6.6-x86_64/libusb.sh

@@ -0,0 +1,3 @@
+#!/bin/env bash
+# Required for tqtc-boot2qt/qdb
+sudo yum install -y libusb1-devel

coin/provisioning/qtci-linux-RHEL-7.2-x86_64/disable_selinux.sh

@@ -0,0 +1,5 @@
+# We need to disable selinux while we are overwriting some binaries
+# required by it. If this is not done, ICU provisioning will create
+# template that is not booting.
+
+sudo sed -i s/SELINUX=enforcing/SELINUX=disabled/g  /etc/selinux/config

coin/provisioning/qtci-linux-RHEL-7.2-x86_64/install_icu.sh

@@ -0,0 +1,70 @@
+#!/bin/env bash
+
+#############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: http://www.qt.io/licensing/
+##
+## This file is part of the test suite of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL21$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see http://www.qt.io/terms-conditions. For further
+## information use the contact form at http://www.qt.io/contact-us.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 2.1 or version 3 as published by the Free
+## Software Foundation and appearing in the file LICENSE.LGPLv21 and
+## LICENSE.LGPLv3 included in the packaging of this file. Please review the
+## following information to ensure the GNU Lesser General Public License
+## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## As a special exception, The Qt Company gives you certain additional
+## rights. These rights are described in The Qt Company LGPL Exception
+## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+# This script installs the right ICU version
+
+set -e
+icuVersion="56.1"
+icuLocation="/usr/lib64"
+sha1="6dd9ca6b185681a7ddc4bb94fd7fced27647a21c"
+
+function Install7ZPackageFromURL {
+    url=$1
+    expectedSha1=$2
+    targetDirectory=$3
+
+    targetFile=`mktemp` || echo "Failed to create temporary file"
+    wget --tries=5 --waitretry=5 --output-document=$targetFile $url || echo "Failed to download '$url' multiple times"
+    echo "$expectedSha1  $targetFile" | sha1sum --check || echo "Failed to check sha1sum"
+    sudo /usr/local/bin/7z x -yo$targetDirectory $targetFile || echo "Failed to unzip $url archive"
+    rm $targetFile
+}
+
+echo "Installing custom ICU $icuVersion $sha1 packages on RHEL to $icuLocation"
+
+baseBinaryPackageURL="http://master.qt.io/development_releases/prebuilt/icu/prebuilt/$icuVersion/icu-linux-g++-Rhel7.2-x64.7z"
+Install7ZPackageFromURL $baseBinaryPackageURL $sha1 "/usr/lib64"
+
+echo "Installing custom ICU devel packages on RHEL"
+
+sha1Dev="bffde26cdea752bee0edd281820c57f1adac3864"
+develPackageURL="http://master.qt.io/development_releases/prebuilt/icu/prebuilt/$icuVersion/icu-linux-g++-Rhel7.2-x64-devel.7z"
+tempDir=`mktemp -d` || echo "Failed to create temporary directory"
+trap "sudo rm -fr $tempDir" EXIT
+Install7ZPackageFromURL $develPackageURL $sha1Dev $tempDir
+sudo cp -a $tempDir/lib/* /usr/lib64
+sudo cp -a $tempDir/* /usr/
+
+sudo /sbin/ldconfig

coin/provisioning/qtci-linux-RHEL-7.2-x86_64/rhel_packages.sh

@@ -0,0 +1,9 @@
+# gstreamer 1 for QtMultimedia
+# gtk3 style for QtGui/QStyle
+# libusb1 for tqtc-boot2qt/qdb
+
+sudo yum install -y \
+    gstreamer1-devel gstreamer1-plugins-base-devel \
+    gtk3-devel \
+    libusb1-devel
+

coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/libusb.sh

@@ -0,0 +1,3 @@
+#!/bin/env bash
+# Required for tqtc-boot2qt/qdb
+sudo apt-get install -y libusb-1.0-0-dev

configure.json

@@ -0,0 +1,7 @@
+{
+    "commandline": {
+        "options": {
+            "skip": "addString"
+        }
+    }
+}

qt.pro

@@ -1,12 +1,10 @@
 # Create the super cache so modules will add themselves to it.
 cache(, super)
 
-CONFIG += build_pass   # hack to disable the .qmake.super auto-add
-load(qt_build_config)
-CONFIG -= build_pass   # unhack, as it confuses Qt Creator
-
 TEMPLATE      = subdirs
 
+CONFIG += prepare_docs qt_docs_targets
+
 # Extract submodules from .gitmodules.
 lines = $$cat(.gitmodules, lines)
 for (line, lines) {
@@ -26,6 +24,29 @@ for (line, lines) {
 }
 QMAKE_INTERNAL_INCLUDED_FILES += $$PWD/.gitmodules
 
+QT_SKIP_MODULES =
+uikit {
+    QT_SKIP_MODULES += qtdoc qtmacextras qtserialport qtwebkit qtwebkit-examples
+    !ios: QT_SKIP_MODULES += qtscript
+}
+
+# This is a bit hacky, but a proper implementation is not worth it.
+args = $$QMAKE_EXTRA_ARGS
+for (ever) {
+    isEmpty(args): break()
+    a = $$take_first(args)
+
+    equals(a, -skip) {
+        isEmpty(args): break()
+        m = $$take_first(args)
+        contains(m, -.*): next()
+        m ~= s/^(qt)?/qt/
+        !contains(modules, $$m): \
+            error("-skip command line argument used with non-existent module '$$m'.")
+        QT_SKIP_MODULES += $$m
+    }
+}
+
 modules = $$sort_depends(modules, module., .depends .recommends)
 modules = $$reverse(modules)
 for (mod, modules) {
@@ -72,3 +93,5 @@ for (mod, modules) {
 
     SUBDIRS += $$mod
 }
+
+load(qt_configure)