aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitmodules97
-rw-r--r--coin/platform_configs/default.txt49
-rw-r--r--coin/platform_configs/qt5.txt13
-rw-r--r--coin/provisioning/qtci-linux-RHEL-6.6-x86_64/libusb.sh3
-rw-r--r--coin/provisioning/qtci-linux-RHEL-7.2-x86_64/disable_selinux.sh5
-rw-r--r--coin/provisioning/qtci-linux-RHEL-7.2-x86_64/install_icu.sh70
-rw-r--r--coin/provisioning/qtci-linux-RHEL-7.2-x86_64/rhel_packages.sh9
-rw-r--r--coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/libusb.sh3
-rw-r--r--configure.json7
-rw-r--r--qt.pro31
m---------qt3d0
m---------qtactiveqt0
m---------qtandroidextras0
m---------qtbase0
m---------qtcanvas3d0
m---------qtcharts0
m---------qtconnectivity0
m---------qtdatavis3d0
m---------qtdeclarative0
m---------qtdoc0
m---------qtdocgallery0
m---------qtenginio0
m---------qtfeedback0
m---------qtgamepad0
m---------qtgraphicaleffects0
m---------qtimageformats0
m---------qtlocation0
m---------qtmacextras0
m---------qtmultimedia0
m---------qtnetworkauth0
m---------qtpim0
m---------qtpurchasing0
m---------qtquick10
m---------qtquickcontrols0
m---------qtquickcontrols20
m---------qtscript0
m---------qtscxml0
m---------qtsensors0
m---------qtserialbus0
m---------qtserialport0
m---------qtspeech0
m---------qtsvg0
m---------qtsystems0
m---------qttools0
m---------qttranslations0
m---------qtvirtualkeyboard0
m---------qtwayland0
m---------qtwebchannel0
m---------qtwebengine0
m---------qtwebkit0
m---------qtwebkit-examples0
m---------qtwebsockets0
m---------qtwebview0
m---------qtwinextras0
m---------qtx11extras0
m---------qtxmlpatterns0
56 files changed, 206 insertions, 81 deletions
diff --git a/.gitmodules b/.gitmodules
index 74081669..58692759 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,66 +1,66 @@
[submodule "qtbase"]
path = qtbase
url = ../qtbase.git
- branch = 5.7
+ branch = 5.8
status = essential
[submodule "qtsvg"]
depends = qtbase
path = qtsvg
url = ../qtsvg.git
- branch = 5.7
+ branch = 5.8
status = addon
[submodule "qtdeclarative"]
depends = qtbase
recommends = qtxmlpatterns
path = qtdeclarative
url = ../qtdeclarative.git
- branch = 5.7
+ branch = 5.8
status = essential
[submodule "qtactiveqt"]
depends = qtbase
path = qtactiveqt
url = ../qtactiveqt.git
- branch = 5.7
+ branch = 5.8
status = addon
[submodule "qtscript"]
depends = qtbase
recommends = qttools
path = qtscript
url = ../qtscript.git
- branch = 5.7
+ branch = 5.8
status = deprecated
[submodule "qtmultimedia"]
depends = qtbase
recommends = qtdeclarative
path = qtmultimedia
url = ../qtmultimedia.git
- branch = 5.7
+ branch = 5.8
status = essential
[submodule "qttools"]
depends = qtbase
recommends = qtdeclarative qtactiveqt qtwebkit
path = qttools
url = ../qttools.git
- branch = 5.7
+ branch = 5.8
status = essential
[submodule "qtxmlpatterns"]
depends = qtbase
path = qtxmlpatterns
url = ../qtxmlpatterns.git
- branch = 5.7
+ branch = 5.8
status = addon
[submodule "qttranslations"]
depends = qttools
path = qttranslations
url = ../qttranslations.git
- branch = 5.7
+ branch = 5.8
status = essential
priority = 30
[submodule "qtdoc"]
depends = qtdeclarative
path = qtdoc
url = ../qtdoc.git
- branch = 5.7
+ branch = 5.8
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
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
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
status = addon
[submodule "qtsensors"]
depends = qtbase
recommends = qtdeclarative qtsvg
path = qtsensors
url = ../qtsensors.git
- branch = 5.7
+ branch = 5.8
status = addon
[submodule "qtsystems"]
depends = qtbase
@@ -136,177 +136,184 @@
recommends = qtdeclarative qtandroidextras
path = qtconnectivity
url = ../qtconnectivity.git
- branch = 5.7
+ branch = 5.8
status = addon
[submodule "qtwayland"]
depends = qtbase
recommends = qtdeclarative
path = qtwayland
url = ../qtwayland.git
- branch = 5.7
+ branch = 5.8
status = addon
[submodule "qt3d"]
depends = qtdeclarative qtimageformats
recommends = qtgamepad
path = qt3d
url = ../qt3d.git
- branch = 5.7
+ branch = 5.8
status = addon
[submodule "qtimageformats"]
depends = qtbase
path = qtimageformats
url = ../qtimageformats.git
- branch = 5.7
+ branch = 5.8
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
status = addon
[submodule "qtquickcontrols"]
depends = qtdeclarative
recommends = qtgraphicaleffects
path = qtquickcontrols
url = ../qtquickcontrols.git
- branch = 5.7
+ branch = 5.8
status = essential
[submodule "qtserialbus"]
depends = qtserialport
path = qtserialbus
url = ../qtserialbus.git
- branch = 5.7
- status = preview
+ branch = 5.8
+ status = addon
[submodule "qtserialport"]
depends = qtbase
path = qtserialport
url = ../qtserialport.git
- branch = 5.7
+ branch = 5.8
status = addon
[submodule "qtx11extras"]
depends = qtbase
path = qtx11extras
url = ../qtx11extras.git
- branch = 5.7
+ branch = 5.8
status = addon
[submodule "qtmacextras"]
depends = qtbase
path = qtmacextras
url = ../qtmacextras.git
- branch = 5.7
+ branch = 5.8
status = addon
[submodule "qtwinextras"]
depends = qtbase
recommends = qtdeclarative qtmultimedia
path = qtwinextras
url = ../qtwinextras.git
- branch = 5.7
+ branch = 5.8
status = addon
[submodule "qtandroidextras"]
depends = qtbase
path = qtandroidextras
url = ../qtandroidextras.git
- branch = 5.7
+ branch = 5.8
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
status = addon
[submodule "qtwebchannel"]
depends = qtbase
recommends = qtdeclarative qtwebsockets
path = qtwebchannel
url = ../qtwebchannel.git
- branch = 5.7
+ branch = 5.8
status = addon
[submodule "qtwebengine"]
depends = qtquickcontrols qtwebchannel
recommends = qtlocation
path = qtwebengine
url = ../qtwebengine.git
- branch = 5.7
+ branch = 5.8
status = addon
priority = 10
[submodule "qtcanvas3d"]
depends = qtdeclarative
path = qtcanvas3d
url = ../qtcanvas3d.git
- branch = 5.7
+ branch = 5.8
status = addon
[submodule "qtwebview"]
depends = qtdeclarative
recommends = qtwebengine
path = qtwebview
url = ../qtwebview.git
- branch = 5.7
+ branch = 5.8
status = addon
[submodule "qtquickcontrols2"]
depends = qtgraphicaleffects
path = qtquickcontrols2
url = ../qtquickcontrols2.git
- branch = 5.7
+ branch = 5.8
status = addon
[submodule "qtpurchasing"]
depends = qtbase qtandroidextras
recommends = qtdeclarative
path = qtpurchasing
url = ../qtpurchasing.git
- branch = 5.7
+ branch = 5.8
status = addon
[submodule "qtcharts"]
depends = qtbase
recommends = qtdeclarative qtmultimedia
path = qtcharts
url = ../qtcharts.git
- branch = 5.7
+ branch = 5.8
status = addon
[submodule "qtdatavis3d"]
depends = qtbase
recommends = qtdeclarative qtmultimedia
path = qtdatavis3d
url = ../qtdatavis3d.git
- branch = 5.7
+ branch = 5.8
status = addon
[submodule "qtvirtualkeyboard"]
depends = qtbase qtdeclarative qtsvg
recommends = qtmultimedia qtquickcontrols
path = qtvirtualkeyboard
url = ../qtvirtualkeyboard.git
- branch = 5.7
+ branch = 5.8
status = addon
[submodule "qtgamepad"]
depends = qtbase
recommends = qtdeclarative
path = qtgamepad
url = ../qtgamepad
- branch = 5.7
+ branch = 5.8
status = preview
[submodule "qtscxml"]
depends = qtbase qtdeclarative
path = qtscxml
url = ../qtscxml
- branch = 5.7
- status = preview
+ branch = 5.8
+ status = addon
[submodule "qtspeech"]
depends = qtbase
recommends = qtdeclarative qtmultimedia
path = qtspeech
url = ../qtspeech
- branch = dev
- status = ignore
+ branch = 5.8
+ status = preview
+[submodule "qtnetworkauth"]
+ depends = qtbase
+ recommends = qtwebview
+ path = qtnetworkauth
+ url = ../qtnetworkauth
+ branch = 5.8
+ status = preview
diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt
index c188c794..58f7967c 100644
--- a/coin/platform_configs/default.txt
+++ b/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
diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt
index 115b862d..797d62cd 100644
--- a/coin/platform_configs/qt5.txt
+++ b/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
diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/libusb.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/libusb.sh
new file mode 100644
index 00000000..229e259f
--- /dev/null
+++ b/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
diff --git a/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/disable_selinux.sh b/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/disable_selinux.sh
new file mode 100644
index 00000000..30162166
--- /dev/null
+++ b/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
diff --git a/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/install_icu.sh b/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/install_icu.sh
new file mode 100644
index 00000000..682ea91c
--- /dev/null
+++ b/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
diff --git a/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/rhel_packages.sh b/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/rhel_packages.sh
new file mode 100644
index 00000000..c322bcbf
--- /dev/null
+++ b/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
+
diff --git a/coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/libusb.sh b/coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/libusb.sh
new file mode 100644
index 00000000..f48a6e36
--- /dev/null
+++ b/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
diff --git a/configure.json b/configure.json
new file mode 100644
index 00000000..f437252f
--- /dev/null
+++ b/configure.json
@@ -0,0 +1,7 @@
+{
+ "commandline": {
+ "options": {
+ "skip": "addString"
+ }
+ }
+}
diff --git a/qt.pro b/qt.pro
index f8d3d4d3..1915fc2c 100644
--- a/qt.pro
+++ b/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)
diff --git a/qt3d b/qt3d
-Subproject 1c52a489c1eed52107cdde28890ca230424bd85
+Subproject abbf2ca1aa6f598a0c0c51a4319b911d58f169a
diff --git a/qtactiveqt b/qtactiveqt
-Subproject 6d57918ce6c45b811c3a71e320b318222c7846b
+Subproject b36beaa453fb855e943205ad28155e1b120c364
diff --git a/qtandroidextras b/qtandroidextras
-Subproject 1895642450f0d798ede50cd5bf9398cdf15d686
+Subproject c9175b821526a94300f16770cadbd88a0f73acd
diff --git a/qtbase b/qtbase
-Subproject 04f68053df5c90dca6947c6d2a5bb4e6851e62b
+Subproject 8b64f9336255fa17f1b8e5f337d0e7976551215
diff --git a/qtcanvas3d b/qtcanvas3d
-Subproject 4edba7c6fe684e4348932c26d45812ec3d8ee2a
+Subproject 2041335c66a20820d55b26368e0c86d6de5d478
diff --git a/qtcharts b/qtcharts
-Subproject 01ec7b7ae4cdfabf2228911a96f57e2da8f333b
+Subproject 0a3e9460c8a54061a6e858e6e65c4b5ea0a8a09
diff --git a/qtconnectivity b/qtconnectivity
-Subproject 61afd66f148af4a8d3e0cad12b7c9419f1122cb
+Subproject 2df17b2a0c050df98bd87a3dff218096ec84b2f
diff --git a/qtdatavis3d b/qtdatavis3d
-Subproject 0bf42b29a9fa926e0ec63a33eb496c660960d61
+Subproject beb420e3995010b5729608922022e65558f5876
diff --git a/qtdeclarative b/qtdeclarative
-Subproject cc1c3d0e2be6dfea6befebdc5f25e519e3fe79b
+Subproject 6746db54f2adb40b836ce41101462bc38604749
diff --git a/qtdoc b/qtdoc
-Subproject 73dc5f8de51ad1fcaff8e30188de23a4d6ff39b
+Subproject ff91e32db83c9a2ddce6ed7254f850ddd7a1238
diff --git a/qtdocgallery b/qtdocgallery
-Subproject 2da36eb615f6f8f06a456d65c45547937b47beb
+Subproject e36e6f0abd45c2794c70c31eb10c5263e7e7a29
diff --git a/qtenginio b/qtenginio
-Subproject 15090ec53621211616c4136ab37e0332c3ae709
+Subproject b0ad5907f480307853f7ac951bacfaa61dcbd94
diff --git a/qtfeedback b/qtfeedback
-Subproject 28ca62414901502189ea28ef2efd55138618761
+Subproject 9ac8d8c272fc93416016e094fc6b97226a40008
diff --git a/qtgamepad b/qtgamepad
-Subproject e5066759bf5d5848bec88683a371f31346a315b
+Subproject 2c55174f267fccdd6bf74171b0da312f895c5a6
diff --git a/qtgraphicaleffects b/qtgraphicaleffects
-Subproject 26a1ddc88e63f2986ec6dad1ad50603782d26f0
+Subproject 254be077bc20f4eb68cc4cc3e44eab8d20cd4f5
diff --git a/qtimageformats b/qtimageformats
-Subproject 018828170d807f6647a843e61c82733c3f601d1
+Subproject 0870e670665a702665948723bb7b1eb61a9572a
diff --git a/qtlocation b/qtlocation
-Subproject e2ece6d1283926c5a91362933719f3d10efa2ed
+Subproject 9643b177a9c63d97d3854b2ed0325f4b8f4e1df
diff --git a/qtmacextras b/qtmacextras
-Subproject f48a3333637199e5335e22bfac39ea7c35b44e4
+Subproject 733d54a6a9522b31c38c973690c3df24d033c80
diff --git a/qtmultimedia b/qtmultimedia
-Subproject 310271a4aa43aad9d8ca09154e5af5b1d6338fc
+Subproject 23a74e810bb2ec4cb950eaae9760889c1e8a5d5
diff --git a/qtnetworkauth b/qtnetworkauth
new file mode 160000
+Subproject 591fe512e3a65877441b4adbf51f388dc4991e7
diff --git a/qtpim b/qtpim
-Subproject de4cfc6b53b426799a035fefe81db9d49d3d03a
+Subproject 02efef5ee63bf2407526f81fd6b68f5a59ac1de
diff --git a/qtpurchasing b/qtpurchasing
-Subproject dd357a2fa106e5ee7eeb0f61388d8485ac0ca14
+Subproject e46edb689a634a2559e867c67f51a00ffc56209
diff --git a/qtquick1 b/qtquick1
-Subproject 26229cfa0b729313893af5674d604e8692dbb94
+Subproject 64faeb0d8003e699a4d09e7dcee1ef6eb10302a
diff --git a/qtquickcontrols b/qtquickcontrols
-Subproject 8dbb5d994e31bf304c12656171e1d7728650ee0
+Subproject 08d0ec79897ea2b9ba830f66f8b2ecfbce8723e
diff --git a/qtquickcontrols2 b/qtquickcontrols2
-Subproject 838fd79152957f457a47cd30970961a27f08684
+Subproject 00a062649b8aec20c3ac3f61aa72b1cdde43b05
diff --git a/qtscript b/qtscript
-Subproject 881231d2c9ff9aa2b19d09af2cb33e3aae6ce9b
+Subproject cec2c4c5fbcc75a990cfc529f2174e0df26b0b2
diff --git a/qtscxml b/qtscxml
-Subproject cef09e6345d245b47eb115d438f6e367503d57f
+Subproject 0a4715a6d2a3bd98eed3ced4d6eeef887c1dd0b
diff --git a/qtsensors b/qtsensors
-Subproject 4c5873b43a2d7d80a33374d89b870a67e7900ec
+Subproject 04c42632315ee4e9ac22003b572d4877fcbd33f
diff --git a/qtserialbus b/qtserialbus
-Subproject 2e409fef8155c5644693f59f4313c3cd875bf19
+Subproject 7408955f6d44b33403cd6419f8a6452d66ce16a
diff --git a/qtserialport b/qtserialport
-Subproject 12575ecc41a54609aaa1ecac0c918fa444d869e
+Subproject f640521532087dc76d36b25a6c49b2f64afcd4d
diff --git a/qtspeech b/qtspeech
-Subproject ca8768b90c07bff5804b1fbb704041a4472f65e
+Subproject 483208aff4f583df2c9c14d0d549c39d6848119
diff --git a/qtsvg b/qtsvg
-Subproject 410b6b529cc6ee9236ee29fcdff4a03ad8670fe
+Subproject 5f5b5f58a976825c883a772d19beac21aaf4dd1
diff --git a/qtsystems b/qtsystems
-Subproject cc2077700bd5503d1fcf53aef83cbb76975e745
+Subproject 434af789f0d56ca7a521ca2d9ec8cf3b1057fd3
diff --git a/qttools b/qttools
-Subproject 6f8bb3d4c5b2f19cbf161f9dfff81e86cd0e17a
+Subproject 980fbea7adb3d31b8017f844bc8856612d3f7cf
diff --git a/qttranslations b/qttranslations
-Subproject 9282969a3291eb6e4c7bcf9cc9b9588499dfc14
+Subproject f97748255437acc0548b9d803467162f39df7a2
diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard
-Subproject c2a58836ba4a9671520da132ee2891245a56405
+Subproject 9beed8859bcf78f5d4cff04be07f1ef52f26688
diff --git a/qtwayland b/qtwayland
-Subproject d27d65dde56fcf5f5b9244cf0acebc9d92eda69
+Subproject 5e6259b09326022324709c44ad533d004056e04
diff --git a/qtwebchannel b/qtwebchannel
-Subproject c3787add37a77efe18e78549e51ff904f07a75f
+Subproject 87d83df5f3fa2a582385e70dc22c4a9789134f9
diff --git a/qtwebengine b/qtwebengine
-Subproject 6766290699acd0d73c81cf690012d52729e518b
+Subproject ceff67e0bab4d34c5b791d1f1b1d43c7a4e44d8
diff --git a/qtwebkit b/qtwebkit
-Subproject bb9f65f54ee866eced8e157b59e64d05a52aa3a
+Subproject a0c60c53c0fe1b1f6b5ab52944e031a3684e3de
diff --git a/qtwebkit-examples b/qtwebkit-examples
-Subproject 7524642b5d429a595bb38e6c7b61e326832d6a4
+Subproject ac8c2122bba9e2ba8887fb5586ca4a8a119cc40
diff --git a/qtwebsockets b/qtwebsockets
-Subproject 1f6a55f97dce97d4d2fe62b8b6a87c18d4f2627
+Subproject 670266a075c7c312c6a7f9465298bfec0b968ee
diff --git a/qtwebview b/qtwebview
-Subproject ba47b1f14e04ebc94190cfd46e372cc2fe464a8
+Subproject 241fe52ae9531f7fad0a5ca1af0bda5a1e5724c
diff --git a/qtwinextras b/qtwinextras
-Subproject 894011181bc18c4d5190424f874d839e2343d38
+Subproject a8bd317652bf44d37ba97033f8c24b64fbae641
diff --git a/qtx11extras b/qtx11extras
-Subproject cd0535c2927f65b7b221c9c946b65147ae1c4db
+Subproject 3cb215e9b988795d6222c9dac38e1a12d00ba83
diff --git a/qtxmlpatterns b/qtxmlpatterns
-Subproject 1433d3461c00ce7c132e8dad22847281d6c13b9
+Subproject b7f8783f25cf1ff0eadbab59701acd46bff58e9