Merge remote-tracking branch 'origin/5.11' into dev

Conflicts: coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh Change-Id: If414fac20cc1cddd155a9f9c8048d0ad76ac54ef
2026-02-02 22:45:23 +08:00 · 2018-08-06 11:31:33 +02:00
parent a43a23f7d1 00730d1caf
commit d746bc3ea8
9 changed files with 98 additions and 17 deletions
--- a/.gitmodules
+++ b/.gitmodules
@@ -143,13 +143,6 @@
 	url = ../qtimageformats.git
 	branch = dev
 	status = addon
-[submodule "qtquick1"]
-	depends = qtscript
-	recommends = qtsvg qtxmlpatterns
-	path = qtquick1
-	url = ../qtquick1.git
-	branch = dev
-	status = ignore
 [submodule "qtgraphicaleffects"]
 	depends = qtdeclarative
 	path = qtgraphicaleffects
--- a/2
+++ b/2
@@ -21,12 +21,10 @@ HOW TO BUILD QT5

    Opensource users:

-        <source_package> = qt-everywhere-opensource-src-<version>
        <license>        = -opensource

    Commercial users:

-        <source_package> = qt-everywhere-enterprise-src-<version>
        <license>        = -commercial

   Linux, Mac:
--- a/80
+++ b/80
@@ -0,0 +1,80 @@
+# Copyright (C) 2016 Olivier Goffart <ogoffart@woboq.com>
+#
+# You may use this file under the terms of the 3-clause BSD license.
+# See the file LICENSE from this package for details.
+
+# This is the clang-format configuration style to be used by Qt,
+# based on the rules from https://wiki.qt.io/Qt_Coding_Style and
+# https://wiki.qt.io/Coding_Conventions
+
+---
+# Webkit style was loosely based on the Qt style
+BasedOnStyle: WebKit
+
+Standard: Cpp11
+
+# Leave the line breaks up to the user.
+# Note that this may be changed at some point in the future.
+ColumnLimit: 0
+# How much weight do extra characters after the line length limit have.
+# PenaltyExcessCharacter: 4
+
+# Disable reflow of qdoc comments: indentation rules are different.
+# Translation comments are also excluded.
+CommentPragmas: "^!|^:"
+
+# We want a space between the type and the star for pointer types.
+PointerBindsToType: false
+
+# We use template< without space.
+SpaceAfterTemplateKeyword: false
+
+# We want to break before the operators, but not before a '='.
+BreakBeforeBinaryOperators: NonAssignment
+
+# Braces are usually attached, but not after functions or class declarations.
+BreakBeforeBraces: Custom
+BraceWrapping:
+    AfterClass: true
+    AfterControlStatement: false
+    AfterEnum: false
+    AfterFunction: true
+    AfterNamespace: false
+    AfterObjCDeclaration: false
+    AfterStruct: false
+    AfterUnion: false
+    BeforeCatch: false
+    BeforeElse: false
+    IndentBraces: false
+
+# When constructor initializers do not fit on one line, put them each on a new line.
+ConstructorInitializerAllOnOneLineOrOnePerLine: true
+# Indent initializers by 8 spaces
+ConstructorInitializerIndentWidth: 8
+
+# Indent width for line continuations.
+ContinuationIndentWidth: 8
+
+# No indentation for namespaces.
+NamespaceIndentation: None
+
+# Horizontally align arguments after an open bracket.
+# The coding style does not specify the following, but this is what gives
+# results closest to the existing code.
+AlignAfterOpenBracket: true
+AlwaysBreakTemplateDeclarations: true
+
+# Ideally we should also allow less short function in a single line, but
+# clang-format does not handle that.
+AllowShortFunctionsOnASingleLine: Inline
+
+# The coding style specifies some include order categories, but also tells to
+# separate categories with an empty line. It does not specify the order within
+# the categories. Since the SortInclude feature of clang-format does not
+# re-order includes separated by empty lines, the feature is not used.
+SortIncludes: false
+
+# macros for which the opening brace stays attached.
+ForEachMacros:   [ foreach, Q_FOREACH, BOOST_FOREACH, forever, Q_FOREVER, QBENCHMARK, QBENCHMARK_ONCE ]
+
+
--- a/coin/provisioning/common/unix/mqtt_broker.sh
+++ b/coin/provisioning/common/unix/mqtt_broker.sh
@@ -39,10 +39,10 @@
 source "${BASH_SOURCE%/*}/InstallFromCompressedFileFromURL.sh"
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"

-CommitSHA="ef4dbc182ddd06247e4b2618d5ad0a57df12ab25"
+CommitSHA="5e14a65bbf602fe5d58afdd1394ce76d41ed5c65"
 PrimaryUrl="http://ci-files01-hki.ci.local/input/mqtt_broker/paho.mqtt.testing-$CommitSHA.zip"
 AltUrl="https://github.com/eclipse/paho.mqtt.testing/archive/$CommitSHA.zip"
-SHA1="ba2b7d05afe4e13446d40cd4e753dda7f325a587"
+SHA1="6afc375c2702eb36a960f38dd4912a3422d679fd"
 targetFolder="/opt/paho_broker"
 appPrefix="paho.mqtt.testing-$CommitSHA"

--- a/coin/provisioning/common/windows/mqtt_broker.ps1
+++ b/coin/provisioning/common/windows/mqtt_broker.ps1
@@ -35,11 +35,11 @@

 Write-Host "MQTT: Downloading Paho test broker..."
 $zip = Get-DownloadLocation "pahotest.zip"
-$commitSHA = "ef4dbc182ddd06247e4b2618d5ad0a57df12ab25"
-$sha1 = "ba2b7d05afe4e13446d40cd4e753dda7f325a587"
+$commitSHA = "5e14a65bbf602fe5d58afdd1394ce76d41ed5c65"
+$sha1 = "6afc375c2702eb36a960f38dd4912a3422d679fd"

-$externalUrl = "http://ci-files01-hki.ci.local/input/mqtt_broker/paho.mqtt.testing-$commitSHA.zip"
-$internalUrl = "https://github.com/eclipse/paho.mqtt.testing/archive/$commitSHA.zip"
+$internalUrl = "http://ci-files01-hki.ci.local/input/mqtt_broker/paho.mqtt.testing-$commitSHA.zip"
+$externalUrl = "https://github.com/eclipse/paho.mqtt.testing/archive/$commitSHA.zip"

 Download $externalUrl $internalUrl $zip
 Verify-Checksum $zip $sha1
--- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh
+++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh
@@ -35,6 +35,9 @@

 set -ex

+# Remove update notifications and packagekit running in the background
+sudo yum -y remove PackageKit gnome-software
+
 installPackages=()
 installPackages+=(git)
 installPackages+=(zlib-devel)
--- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh
@@ -169,3 +169,10 @@ pip wheel --wheel-dir $HOME/python3-wheels -r ${BASH_SOURCE%/*}/../common/shared

 source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
 SetEnvVar "PYTHON3_WHEEL_CACHE" "$HOME/python3-wheels"
+
+sudo tee "/etc/apt/sources.list" > /dev/null <<-EOC
+deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu.trumpetti.atm.tut.fi/ubuntu/ xenial main restricted universe multiverse
+deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu.trumpetti.atm.tut.fi/ubuntu/ xenial-updates main restricted universe multiverse
+deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu.trumpetti.atm.tut.fi/ubuntu/ xenial-backports main restricted universe
+deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu.trumpetti.atm.tut.fi/ubuntu/ xenial-security main restricted universe multiverse
+EOC
--- a/3
+++ b/3
@@ -414,7 +414,8 @@ sub git_clone_all_submodules
            my $branch = $subbranches{$module};
            die("No branch defined for submodule $module.\n") if (!defined($branch));
            my $orig_cwd = getcwd();
-            chdir($module) or confess "chdir $module: $OS_ERROR";
+            my $module_dir = $subdirs{$module};
+            chdir($module_dir) or confess "chdir $module_dir: $OS_ERROR";
            my $br = qx(git rev-parse -q --verify $branch);
            if (!$br) {
                $self->exe('git', 'checkout', '-b', $branch, "origin/$branch");
--- a/1
+++ b/1