From bc14adc8317e75ed58f25b255eed95ac93141ea5 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Wed, 6 Mar 2019 10:58:55 +0100 Subject: Shrink build configurations and modules This change disables all modules except qtbase from the build and also reduces the build to one configuration. This is not intended to be merged back to qt5/dev but rather a starting point to build up cmake builds in the CI platform by platform and module by module. Change-Id: I899da885dacb32188a0d02b2301df3d4450c0589 Reviewed-by: Alexandru Croitor Reviewed-by: Tobias Hunger --- .gitmodules | 80 +++++++++++++++++++-------------------- coin/platform_configs/default.txt | 27 +------------ coin/platform_configs/qt5.txt | 22 ----------- coin/platform_configs/qtbase.txt | 7 ---- 4 files changed, 41 insertions(+), 95 deletions(-) delete mode 100644 coin/platform_configs/qt5.txt delete mode 100644 coin/platform_configs/qtbase.txt diff --git a/.gitmodules b/.gitmodules index 762ce50a..d93c1049 100644 --- a/.gitmodules +++ b/.gitmodules @@ -8,54 +8,54 @@ path = qtsvg url = ../qtsvg.git branch = dev - status = addon + status = ignore [submodule "qtdeclarative"] depends = qtbase recommends = qtsvg path = qtdeclarative url = ../qtdeclarative.git branch = dev - status = essential + status = ignore [submodule "qtactiveqt"] depends = qtbase path = qtactiveqt url = ../qtactiveqt.git branch = dev - status = addon + status = ignore [submodule "qtscript"] depends = qtbase recommends = qttools path = qtscript url = ../qtscript.git branch = dev - status = deprecated + status = ignore [submodule "qtmultimedia"] depends = qtbase recommends = qtdeclarative path = qtmultimedia url = ../qtmultimedia.git branch = dev - status = essential + status = ignore [submodule "qttools"] depends = qtbase recommends = qtdeclarative qtactiveqt path = qttools url = ../qttools.git branch = dev - status = essential + status = ignore [submodule "qtxmlpatterns"] depends = qtbase recommends = qtdeclarative path = qtxmlpatterns url = ../qtxmlpatterns.git branch = dev - status = addon + status = ignore [submodule "qttranslations"] depends = qttools path = qttranslations url = ../qttranslations.git branch = dev - status = essential + status = ignore priority = 30 [submodule "qtdoc"] depends = qtdeclarative qttools @@ -63,7 +63,7 @@ path = qtdoc url = ../qtdoc.git branch = dev - status = essential + status = ignore priority = 40 [submodule "qtrepotools"] path = qtrepotools @@ -76,7 +76,7 @@ path = qtqa url = ../qtqa.git branch = master - status = essential + status = ignore priority = 50 [submodule "qtlocation"] depends = qtbase @@ -84,14 +84,14 @@ path = qtlocation url = ../qtlocation.git branch = dev - status = addon + status = ignore [submodule "qtsensors"] depends = qtbase recommends = qtdeclarative path = qtsensors url = ../qtsensors.git branch = dev - status = addon + status = ignore [submodule "qtsystems"] depends = qtbase recommends = qtdeclarative @@ -124,99 +124,99 @@ path = qtconnectivity url = ../qtconnectivity.git branch = dev - status = addon + status = ignore [submodule "qtwayland"] depends = qtbase recommends = qtdeclarative path = qtwayland url = ../qtwayland.git branch = dev - status = addon + status = ignore [submodule "qt3d"] depends = qtbase recommends = qtdeclarative qtimageformats qtgamepad path = qt3d url = ../qt3d.git branch = dev - status = addon + status = ignore [submodule "qtimageformats"] depends = qtbase path = qtimageformats url = ../qtimageformats.git branch = dev - status = addon + status = ignore [submodule "qtgraphicaleffects"] depends = qtdeclarative path = qtgraphicaleffects url = ../qtgraphicaleffects.git branch = dev - status = addon + status = ignore [submodule "qtquickcontrols"] depends = qtdeclarative recommends = qtgraphicaleffects path = qtquickcontrols url = ../qtquickcontrols.git branch = dev - status = addon + status = ignore [submodule "qtserialbus"] depends = qtbase recommends = qtserialport path = qtserialbus url = ../qtserialbus.git branch = dev - status = addon + status = ignore [submodule "qtserialport"] depends = qtbase path = qtserialport url = ../qtserialport.git branch = dev - status = addon + status = ignore [submodule "qtx11extras"] depends = qtbase path = qtx11extras url = ../qtx11extras.git branch = dev - status = addon + status = ignore [submodule "qtmacextras"] depends = qtbase path = qtmacextras url = ../qtmacextras.git branch = dev - status = addon + status = ignore [submodule "qtwinextras"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtwinextras url = ../qtwinextras.git branch = dev - status = addon + status = ignore [submodule "qtandroidextras"] depends = qtbase path = qtandroidextras url = ../qtandroidextras.git branch = dev - status = addon + status = ignore [submodule "qtwebsockets"] depends = qtbase recommends = qtdeclarative path = qtwebsockets url = ../qtwebsockets.git branch = dev - status = addon + status = ignore [submodule "qtwebchannel"] depends = qtbase recommends = qtdeclarative qtwebsockets path = qtwebchannel url = ../qtwebchannel.git branch = dev - status = addon + status = ignore [submodule "qtwebengine"] depends = qtdeclarative recommends = qtquickcontrols qtquickcontrols2 qtlocation qtwebchannel qttools path = qtwebengine url = ../qtwebengine.git branch = dev - status = addon + status = ignore priority = 10 [submodule "qtcanvas3d"] depends = qtdeclarative @@ -230,85 +230,85 @@ path = qtwebview url = ../qtwebview.git branch = dev - status = addon + status = ignore [submodule "qtquickcontrols2"] depends = qtgraphicaleffects recommends = qtimageformats path = qtquickcontrols2 url = ../qtquickcontrols2.git branch = dev - status = essential + status = ignore [submodule "qtpurchasing"] depends = qtbase recommends = qtdeclarative qtandroidextras path = qtpurchasing url = ../qtpurchasing.git branch = dev - status = addon + status = ignore [submodule "qtcharts"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtcharts url = ../qtcharts.git branch = dev - status = addon + status = ignore [submodule "qtdatavis3d"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtdatavis3d url = ../qtdatavis3d.git branch = dev - status = addon + status = ignore [submodule "qtvirtualkeyboard"] depends = qtbase qtdeclarative qtsvg recommends = qtmultimedia qtquickcontrols path = qtvirtualkeyboard url = ../qtvirtualkeyboard.git branch = dev - status = addon + status = ignore [submodule "qtgamepad"] depends = qtbase recommends = qtdeclarative path = qtgamepad url = ../qtgamepad.git branch = dev - status = addon + status = ignore [submodule "qtscxml"] depends = qtbase qtdeclarative path = qtscxml url = ../qtscxml.git branch = dev - status = addon + status = ignore [submodule "qtspeech"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtspeech url = ../qtspeech.git branch = dev - status = addon + status = ignore [submodule "qtnetworkauth"] depends = qtbase path = qtnetworkauth url = ../qtnetworkauth.git branch = dev - status = addon + status = ignore [submodule "qtremoteobjects"] depends = qtbase recommends = qtdeclarative path = qtremoteobjects url = ../qtremoteobjects.git branch = dev - status = addon + status = ignore [submodule "qtwebglplugin"] depends = qtbase qtwebsockets recommends = qtdeclarative path = qtwebglplugin url = ../qtwebglplugin.git branch = dev - status = addon + status = ignore [submodule "qtlottie"] depends = qtbase qtdeclarative path = qtlottie url = ../qtlottie.git branch = dev - status = preview + status = ignore diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index 90095639..0b81d97d 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -1,28 +1,3 @@ Template Target OS Target arch Compiler Target Compiler Features ----------------------------------- ------------------- ----------- ----------- --------------- ------------------------------------------------------------------------------------- -qtci-windows-10-x86_64-10 MSVC2015 DeveloperBuild Release QtNamespace QtLibInfix BuildExamples -qtci-windows-7-x86-3 Mingw73 DeveloperBuild Release OpenGLDynamic -qtci-windows-10-x86_64-10 x86 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic -qtci-windows-10-x86_64-10 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic -qtci-windows-10-x86_64-10 WinRT_10 x86 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests -qtci-windows-10-x86_64-10 WinRT_10 armv7 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests -qtci-windows-10-x86_64-10 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic -qtci-linux-Ubuntu-18.04-x86_64 GCC NoWidgets ForceDebugInfo -qtci-linux-Ubuntu-18.04-x86_64 GCC DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace BuildExamples Documentation -qtci-linux-openSUSE-15.0-x86_64 GCC DeveloperBuild NoPch -qtci-linux-openSUSE-15.0-x86_64 ICC_18 DeveloperBuild NoPch DisableTests SystemSQLite -qtci-linux-openSUSE-15.0-x86_64 WebAssembly GCC Packaging DeveloperBuild NoPch DisableTests -qtci-linux-RHEL-7.4-x86_64 GCC Packaging Release NoUseGoldLinker ForceDebugInfo SeparateDebugInfo -qtci-macos-10.13-x86_64-2 Clang Packaging DebugAndRelease Release -qtci-macos-10.12-x86_64-9 Clang DeveloperBuild NoFramework Release QtNamespace NoPch -qtci-macos-10.13-x86_64-2 IOS_ANY multi Clang Packaging DebugAndRelease DisableTests Static -qtci-macos-10.13-x86_64-2 TvOS_ANY multi Clang DebugAndRelease DisableTests -qtci-macos-10.13-x86_64-2 WatchOS_ANY multi Clang DebugAndRelease DisableTests -qtci-linux-RHEL-7.4-x86_64 Android_ANY armv7 Clang Clang Packaging Release DisableTests OpenGLES2 NoUseGoldLinker -qtci-linux-RHEL-7.4-x86_64 Android_ANY arm64 Clang Clang Packaging Release DisableTests OpenGLES2 NoUseGoldLinker -qtci-linux-Ubuntu-18.04-x86_64 QEMU armv7 GCC Release -qtci-linux-Ubuntu-18.04-x86_64 QEMU arm64 GCC Release -qtci-linux-Ubuntu-18.04-x86_64 QEMU mips64 GCC Release DisableTests -qtci-linux-Ubuntu-18.04-x86_64 GCC TestOnly LicenseCheck -qtci-linux-RHEL-7.4-x86_64 INTEGRITY_11_04 armv7 GCC Release DisableTests OpenGLES2 NoUseGoldLinker -qtci-linux-RHEL-7.4-x86_64 QNX_700 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker +qtci-linux-Ubuntu-18.04-x86_64 GCC DisableTests diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt deleted file mode 100644 index 3de18a74..00000000 --- a/coin/platform_configs/qt5.txt +++ /dev/null @@ -1,22 +0,0 @@ -Template Target OS Target arch Compiler Target Compiler Features ---------------------------- ------------------- ----------- ----------- --------------- ------------------------------------------------------------------------------------- -qtci-windows-10-x86_64-10 WinRT_10 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests -qtci-windows-10-x86_64-10 x86 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic -qtci-windows-10-x86_64-10 WinRT_10 x86 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests -qtci-windows-7-x86-3 Mingw73 Packaging DebugAndRelease Release OpenGLDynamic DisableTests -qtci-windows-10-x86_64-10 Mingw73 Packaging DebugAndRelease Release OpenGLDynamic DisableTests -qtci-windows-10-x86_64-10 WinRT_10 armv7 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests -qtci-windows-10-x86_64-10 WinRT_10 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests -qtci-linux-RHEL-7.4-x86_64 Android_ANY x86 GCC Clang Packaging Release DisableTests OpenGLES2 NoUseGoldLinker -qtci-windows-10-x86_64-10 Android_ANY armv7 Mingw73 Clang Packaging Release DisableTests OpenGLES2 -qtci-windows-10-x86_64-10 Android_ANY arm64 Mingw73 Clang Packaging Release DisableTests OpenGLES2 -qtci-windows-10-x86_64-10 Android_ANY x86 Mingw73 Clang Packaging Release DisableTests OpenGLES2 -qtci-macos-10.13-x86_64-2 Android_ANY armv7 Clang Clang Packaging Release DisableTests OpenGLES2 -qtci-macos-10.13-x86_64-2 Android_ANY arm64 Clang Clang Packaging Release DisableTests OpenGLES2 -qtci-macos-10.13-x86_64-2 Android_ANY x86 Clang Clang Packaging Release DisableTests OpenGLES2 -qtci-macos-10.13-x86_64-2 QNX_700 x86 GCC Release DisableTests OpenGLES2 NoUseGoldLinker -qtci-windows-10-x86_64-10 QNX_700 armv7 Mingw73 Packaging Release DisableTests OpenGLES2 -qtci-windows-10-x86_64-10 QNX_700 armv8 Mingw73 Packaging Release DisableTests OpenGLES2 -qtci-windows-10-x86_64-10 QNX_700 x86_64 Mingw73 Packaging Release DisableTests OpenGLES2 -qtci-linux-RHEL-7.4-x86_64 QNX_700 armv8 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker -qtci-linux-RHEL-7.4-x86_64 QNX_700 x86_64 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker diff --git a/coin/platform_configs/qtbase.txt b/coin/platform_configs/qtbase.txt deleted file mode 100644 index edaf168f..00000000 --- a/coin/platform_configs/qtbase.txt +++ /dev/null @@ -1,7 +0,0 @@ -Template Target OS Target arch Compiler Features ---------------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- -qtci-linux-Ubuntu-18.04-x86_64 QEMU armv7 GCC DeveloperBuild DisableTests -qtci-linux-Ubuntu-18.04-x86_64 QEMU arm64 GCC DeveloperBuild DisableTests -qtci-windows-10-x86_64-10 WinRT_10 x86_64 MSVC2015 DeveloperBuild Static Release ForceDebugInfo -qtci-linux-openSUSE-15.0-x86_64 WebAssembly GCC DeveloperBuild NoPch DisableTests - -- cgit v1.2.3 From 36f7ccc586e41180889de9ecfe64d473a3e2e53e Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Tue, 12 Feb 2019 10:54:16 +0100 Subject: Cmake: install latest 3.14.0-rc3 packages on Linux Change-Id: I5d88ac6c9180c24538de7c386d026f2d6547ccf4 Reviewed-by: Alexandru Croitor --- coin/provisioning/common/linux/cmake_linux.sh | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/coin/provisioning/common/linux/cmake_linux.sh b/coin/provisioning/common/linux/cmake_linux.sh index 2b8d71d0..4a773c43 100755 --- a/coin/provisioning/common/linux/cmake_linux.sh +++ b/coin/provisioning/common/linux/cmake_linux.sh @@ -33,7 +33,7 @@ ## ############################################################################# -# This script installs CMake 3.6.2 +# This script installs CMake # CMake is needed for autotests that verify that Qt can be built with CMake @@ -42,10 +42,11 @@ source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh" # shellcheck source=../unix/SetEnvVar.sh source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" -version="3.6.2" -PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/cmake/cmake-3.6.2-Linux-x86_64.tar.gz" -AltUrl="https://cmake.org/files/v3.6/cmake-3.6.2-Linux-x86_64.tar.gz" -SHA1="dd9d8d57b66109d4bac6eef9209beb94608a185c" +majorminorversion="3.14" +version="3.14.0-rc3" +PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/cmake/cmake-$version-Linux-x86_64.tar.gz" +AltUrl="https://cmake.org/files/v$majorminorversion/cmake-$version-Linux-x86_64.tar.gz" +SHA1="4dcd279a90aa7522c9a1d4be11b86395c5d1c729" targetFolder="/opt/cmake-$version" appPrefix="cmake-$version-Linux-x86_64" -- cgit v1.2.3 From d9bf3742ad11eda2345053e651f01d884791e187 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Wed, 13 Mar 2019 15:48:43 +0100 Subject: Add double-conversion to the list of installed packages This external dependency is now required by QtCore on Linux. Change-Id: I910a3e17ec4d6c10ad4e1a9dfc31d1340fe110de Reviewed-by: Alexandru Croitor --- coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh index f0585186..509c6747 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh @@ -166,6 +166,8 @@ installPackages+=(git-lfs) installPackages+=(chrpath) installPackages+=(gawk) installPackages+=(texinfo) +# Needed for QtCore +installPackages+=(libdouble-conversion-dev) echo "Running update for apt" waitLoop -- cgit v1.2.3 From 7343e226d42c8425577a26d161ac9d9738571548 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Fri, 15 Mar 2019 10:54:00 +0100 Subject: Provisioning: build cmake from source Change-Id: I6b4006250a7e019d7c38eaf3c29ae75a3a65300c Reviewed-by: Alexandru Croitor Reviewed-by: Simon Hausmann --- coin/provisioning/common/unix/install_cmake.sh | 70 ++++++++++++++++++++++ .../qtci-linux-Ubuntu-18.04-x86_64/40-cmake.sh | 5 -- .../40-install-cmake.sh | 5 ++ 3 files changed, 75 insertions(+), 5 deletions(-) create mode 100755 coin/provisioning/common/unix/install_cmake.sh delete mode 100755 coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/40-cmake.sh create mode 100755 coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/40-install-cmake.sh diff --git a/coin/provisioning/common/unix/install_cmake.sh b/coin/provisioning/common/unix/install_cmake.sh new file mode 100755 index 00000000..1e33c007 --- /dev/null +++ b/coin/provisioning/common/unix/install_cmake.sh @@ -0,0 +1,70 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2019 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the provisioning scripts 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$ +## +############################################################################# + +# shellcheck source=../unix/DownloadURL.sh +source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh" +# shellcheck source=../unix/SetEnvVar.sh +source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" + +set -ex + +# This script will install Cmake + +version="e1af2489fda9129e735007a069fae018c4ab3431" +sha1="357ad8003b30ec23037b59b750b96a75e52f78bb" +internalUrl="http://ci-files01-hki.intra.qt.io/input/cmake/CMake-$version.zip" +externalUrl="https://codeload.github.com/Kitware/CMake/zip/$version" + +targetDir="$HOME/CMake-$version" +targetFile="$targetDir.zip" +installFolder="$HOME" +cmakeHome="$HOME/cmake" +DownloadURL "$internalUrl" "$externalUrl" "$sha1" "$targetFile" +unzip "$targetFile" -d "$HOME" +sudo rm "$targetFile" + +echo "Configuring and building cmake" +cd "$targetDir" +if uname -a |grep -qv Darwin; then + ./bootstrap --prefix="$cmakeHome" + make + make install +fi + +sudo rm -r "$targetDir" + +SetEnvVar "PATH" "$cmakeHome/bin:\$PATH" + +echo "CMake = $version" >> ~/versions.txt diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/40-cmake.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/40-cmake.sh deleted file mode 100755 index db8a3ff5..00000000 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/40-cmake.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash - -BASEDIR=$(dirname "$0") -"$BASEDIR/../common/linux/cmake_linux.sh" - diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/40-install-cmake.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/40-install-cmake.sh new file mode 100755 index 00000000..0d799bff --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/40-install-cmake.sh @@ -0,0 +1,5 @@ +#!/bin/bash + +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/unix/install_cmake.sh" + -- cgit v1.2.3 From 38b6cbfd4261433548674aa4d109fff8a007c636 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Fri, 15 Mar 2019 22:29:35 +0100 Subject: Provisioning: Add pcre2 to the list of installed packages This external dependency is now required by QtCore on Linux. Change-Id: I47ba758e86e110c33f9e2bc7607ff9352892470a Reviewed-by: Simon Hausmann --- coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh index 509c6747..15b8397b 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh @@ -168,6 +168,7 @@ installPackages+=(gawk) installPackages+=(texinfo) # Needed for QtCore installPackages+=(libdouble-conversion-dev) +installPackages+=(libpcre2-dev) echo "Running update for apt" waitLoop -- cgit v1.2.3 From e57569e70c36cada31d4bf5cf9a8d93b1528ebeb Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Fri, 3 May 2019 10:11:27 +0200 Subject: Update submodules on 'wip/cmake' in qt5 Only needed for qtbase though. Change-Id: Ib3fdd44c2804139795fc1efc192e05d227f8b8dc Reviewed-by: Alexandru Croitor --- qtbase | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtbase b/qtbase index 17512d49..c2379c46 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 17512d497d7eaf01aefe8140f5010818c0103a95 +Subproject commit c2379c469cb464df7c4ab78eb65e32f795ed050e -- cgit v1.2.3 From 05eaaeda4b8c34b1df44e8427d364263e91a4cb6 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Mon, 18 Mar 2019 09:11:23 +0100 Subject: Add macOS 10.13 to test cmake build Change-Id: I676db571d3a14f2abd823d41905b95a070c66f59 Reviewed-by: Alexandru Croitor --- coin/platform_configs/default.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index 0b81d97d..d6e936a8 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -1,3 +1,4 @@ Template Target OS Target arch Compiler Target Compiler Features ----------------------------------- ------------------- ----------- ----------- --------------- ------------------------------------------------------------------------------------- qtci-linux-Ubuntu-18.04-x86_64 GCC DisableTests +qtci-macos-10.13-x86_64-2 Clang DisableTests -- cgit v1.2.3 From 8b0a10d1c1030739045b085e4084861d477fed3d Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Mon, 18 Mar 2019 13:16:13 +0100 Subject: Provisioning: build cmake from source on macOS 10.13 Change-Id: Ifada0cf62d1e75e8cab3e3bbe6250718747d0703 Reviewed-by: Alexandru Croitor --- coin/provisioning/common/unix/install_cmake.sh | 12 +++++++----- coin/provisioning/qtci-macos-10.13-x86_64/25-cmake.sh | 6 ------ .../provisioning/qtci-macos-10.13-x86_64/25-install-cmake.sh | 6 ++++++ 3 files changed, 13 insertions(+), 11 deletions(-) delete mode 100755 coin/provisioning/qtci-macos-10.13-x86_64/25-cmake.sh create mode 100755 coin/provisioning/qtci-macos-10.13-x86_64/25-install-cmake.sh diff --git a/coin/provisioning/common/unix/install_cmake.sh b/coin/provisioning/common/unix/install_cmake.sh index 1e33c007..e76d2c6d 100755 --- a/coin/provisioning/common/unix/install_cmake.sh +++ b/coin/provisioning/common/unix/install_cmake.sh @@ -57,14 +57,16 @@ sudo rm "$targetFile" echo "Configuring and building cmake" cd "$targetDir" -if uname -a |grep -qv Darwin; then +if uname -a |grep -q Darwin; then + ./bootstrap --prefix="$(xcrun --sdk macosx --show-sdk-path)/usr/local" + SetEnvVar PATH "\$PATH:$(xcrun --sdk macosx --show-sdk-path)/usr/local/bin" +else ./bootstrap --prefix="$cmakeHome" - make - make install + SetEnvVar "PATH" "$cmakeHome/bin:\$PATH" fi +make +sudo make install sudo rm -r "$targetDir" -SetEnvVar "PATH" "$cmakeHome/bin:\$PATH" - echo "CMake = $version" >> ~/versions.txt diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/25-cmake.sh b/coin/provisioning/qtci-macos-10.13-x86_64/25-cmake.sh deleted file mode 100755 index 4f4d405e..00000000 --- a/coin/provisioning/qtci-macos-10.13-x86_64/25-cmake.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -set -ex - -BASEDIR=$(dirname "$0") -"$BASEDIR/../common/macos/cmake.sh" diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/25-install-cmake.sh b/coin/provisioning/qtci-macos-10.13-x86_64/25-install-cmake.sh new file mode 100755 index 00000000..a87667fe --- /dev/null +++ b/coin/provisioning/qtci-macos-10.13-x86_64/25-install-cmake.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash + +set -ex + +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/unix/install_cmake.sh" -- cgit v1.2.3 From 705696e1d151b4d3ff1d0f74d2ee852ef2b6300f Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Tue, 19 Mar 2019 15:09:01 +0100 Subject: Provisioning: Add pcre2 to the list of installed packages This external dependency is now required by QtCore on macOS. Change-Id: I4eef98e8e54f00861c1e9469dfbac61979d652e8 Reviewed-by: Alexandru Croitor --- coin/provisioning/qtci-macos-10.13-x86_64/26-pcre2.sh | 5 +++++ 1 file changed, 5 insertions(+) create mode 100755 coin/provisioning/qtci-macos-10.13-x86_64/26-pcre2.sh diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/26-pcre2.sh b/coin/provisioning/qtci-macos-10.13-x86_64/26-pcre2.sh new file mode 100755 index 00000000..f8af516b --- /dev/null +++ b/coin/provisioning/qtci-macos-10.13-x86_64/26-pcre2.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env bash + +set -ex + +brew install pcre2 -- cgit v1.2.3 From cb860d794d4f79f1d371e893788139061fdac055 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Wed, 20 Mar 2019 13:52:36 +0100 Subject: Provisioning: Add freetype to the list of installed packages on macOS Change-Id: Ic2df763fc027e3a588723a37a70354d3becc29a6 Reviewed-by: Alexandru Croitor --- coin/provisioning/qtci-macos-10.13-x86_64/26-freetype.sh | 5 +++++ 1 file changed, 5 insertions(+) create mode 100755 coin/provisioning/qtci-macos-10.13-x86_64/26-freetype.sh diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/26-freetype.sh b/coin/provisioning/qtci-macos-10.13-x86_64/26-freetype.sh new file mode 100755 index 00000000..0faec4b4 --- /dev/null +++ b/coin/provisioning/qtci-macos-10.13-x86_64/26-freetype.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env bash + +set -ex + +brew install freetype -- cgit v1.2.3 From ad2f91e41476f68f8426b902c0ee4593b7e662d4 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Fri, 29 Mar 2019 13:41:54 +0100 Subject: Provisioning: Add Windows 10+MSVC2017 to test cmake build Change-Id: I7acd16f12ed0e5d0fb7a9961c9099b9e4f1a2401 Reviewed-by: Alexandru Croitor --- coin/platform_configs/default.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index d6e936a8..3867956a 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -2,3 +2,4 @@ Template Target OS Target arch Compiler ----------------------------------- ------------------- ----------- ----------- --------------- ------------------------------------------------------------------------------------- qtci-linux-Ubuntu-18.04-x86_64 GCC DisableTests qtci-macos-10.13-x86_64-2 Clang DisableTests +qtci-windows-10-x86_64-14 MSVC2017 DisableTests -- cgit v1.2.3 From 4c655a140b55502179e69930c019bbb4abb3271a Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Mon, 1 Apr 2019 08:53:27 +0200 Subject: Provisioning: install latest cmake - 3.14.1 on Windows Change-Id: I461589be02c26e048d5975d59600376022d728fd Reviewed-by: Alexandru Croitor --- coin/provisioning/common/windows/cmake.ps1 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/coin/provisioning/common/windows/cmake.ps1 b/coin/provisioning/common/windows/cmake.ps1 index ec84d706..1c19c980 100644 --- a/coin/provisioning/common/windows/cmake.ps1 +++ b/coin/provisioning/common/windows/cmake.ps1 @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2017 The Qt Company Ltd. +## Copyright (C) 2019 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -33,8 +33,8 @@ . "$PSScriptRoot\helpers.ps1" -$majorminorversion = "3.6" -$version = "3.6.2" +$majorminorversion = "3.14" +$version = "3.14.1" $zip = Get-DownloadLocation ("cmake-" + $version + "-win32-x86.zip") $officialurl = "https://cmake.org/files/v" + $majorminorversion + "/cmake-" + $version + "-win32-x86.zip" @@ -44,7 +44,7 @@ Write-Host "Removing old cmake" Remove-Item "C:\CMake" -Force -Recurse -ErrorAction SilentlyContinue Download $officialurl $cachedurl $zip -Verify-Checksum $zip "541F6E7EFD228E46770B8631FFE57097576E4D4E" +Verify-Checksum $zip "C1626FD07B09C76736F5AC9DA7B4374919EB9964" Extract-7Zip $zip C: $defaultinstallfolder = "C:\cmake-" + $version + "-win32-x86" -- cgit v1.2.3 From 21604cf7da1e9645cec1b944d413a27b3e420193 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Tue, 2 Apr 2019 10:48:34 +0200 Subject: Provisioning: install vcpkg and some packages on Windows 10 Change-Id: Ib8ba5b30ebcfb5e66ce5de65c9287807943d7166 Reviewed-by: Alexandru Croitor --- coin/provisioning/common/windows/install-vcpkg.ps1 | 65 ++++++++++++++++++++++ .../qtci-windows-10-x86_64/90-install-vcpkg.ps1 | 2 + 2 files changed, 67 insertions(+) create mode 100644 coin/provisioning/common/windows/install-vcpkg.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/90-install-vcpkg.ps1 diff --git a/coin/provisioning/common/windows/install-vcpkg.ps1 b/coin/provisioning/common/windows/install-vcpkg.ps1 new file mode 100644 index 00000000..673274da --- /dev/null +++ b/coin/provisioning/common/windows/install-vcpkg.ps1 @@ -0,0 +1,65 @@ +############################################################################# +## +## Copyright (C) 2019 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the provisioning scripts 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$ +## +############################################################################# +. "$PSScriptRoot\helpers.ps1" + +# This script will install vcpkg + +$version = "08ad9d88ecabf9f8111bd4df0ca74723550503cd" +$sha1 = "43b471aebc2f46bee00c86710d0311ef6fb7bb19" +$officialUrl = "https://codeload.github.com/liangqi/vcpkg/zip/qt" +$cachedUrl = "http://ci-files01-hki.ci.local/input/vcpkg/vcpkg-$version.zip" +$zip = "C:\Utils\vcpkg-$version.zip" +$installationFolder = "C:\Utils\vcpkg" + +Write-Host "Installing vcpkg" +Download "$officialUrl" "$cachedUrl" "$zip" +Verify-Checksum "$zip" "$sha1" +Extract-7Zip "$zip" C:\Utils +cmd /c mklink /d "$installationFolder" "C:\Utils\vcpkg-qt" +cd "C:\Utils\vcpkg-qt\" +cmd /c "`"C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Professional\\VC\\Auxiliary\\Build\\vcvars64.bat`" && bootstrap-vcpkg.bat" + +if(![System.IO.File]::Exists("$installationFolder\vcpkg.exe")){ + Write-Host "Can't find $installationFolder\vcpkg.exe. Installation probably failed!" + exit 1 +} + +Set-EnvironmentVariable VCPKG_DEFAULT_TRIPLET "x64-windows" +Set-EnvironmentVariable VCPKG_CMAKE_TOOLCHAIN_FILE "$installationFolder\scripts\buildsystems\vcpkg.cmake" + +# pcre2-16.dll was used when generating qvulkanfunctions.h +Add-Path "C:\Utils\vcpkg\installed\x64-windows\bin" + +cmd /c "`"C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Professional\\VC\\Auxiliary\\Build\\vcvars64.bat`" && $installationFolder\vcpkg.exe --triplet x64-windows install zlib pcre2 double-conversion harfbuzz openssl" + +Remove-Item "$zip" diff --git a/coin/provisioning/qtci-windows-10-x86_64/90-install-vcpkg.ps1 b/coin/provisioning/qtci-windows-10-x86_64/90-install-vcpkg.ps1 new file mode 100644 index 00000000..c898da22 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/90-install-vcpkg.ps1 @@ -0,0 +1,2 @@ +. "$PSScriptRoot\..\common\windows\install-vcpkg.ps1" + -- cgit v1.2.3 From 073dfc6457c18f69499536c86125f998b0a7b336 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Wed, 8 May 2019 16:16:43 +0200 Subject: Update submodules on 'wip/cmake' in qt5 Change-Id: I437150950324ad3734ad895b6cbc4ad7bf6139a1 Reviewed-by: Liang Qi Reviewed-by: Alexandru Croitor --- qtbase | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtbase b/qtbase index c2379c46..5c98110f 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit c2379c469cb464df7c4ab78eb65e32f795ed050e +Subproject commit 5c98110fca071f4c0c8bcc68b8d8e12b96a0fce2 -- cgit v1.2.3 From 20e8121c775a307d68e600095b1410d408a487b2 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Thu, 25 Apr 2019 11:43:00 +0200 Subject: Use yaml configuration file for cmake support MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It is needed by new coin to support cmake build as only there configuration arguments are separated from features. Change-Id: I960ec693f80803fd86de472efc953a38358ae14e Reviewed-by: Jędrzej Nowacki --- coin/platform_configs/default.yaml | 13 +++++++++++++ coin/platform_configs/qt3d-runtime.txt | 21 --------------------- coin/platform_configs/qtconnectivity.txt | 3 --- coin/platform_configs/qtdeclarative.txt | 4 ---- coin/platform_configs/qtsaferenderer.txt | 3 --- coin/platform_configs/qtsdk.txt | 4 ---- coin/platform_configs/qtwebkit.txt | 4 ---- coin/platform_configs/tqtc-qt-rta.txt | 6 ------ 8 files changed, 13 insertions(+), 45 deletions(-) create mode 100644 coin/platform_configs/default.yaml delete mode 100644 coin/platform_configs/qt3d-runtime.txt delete mode 100644 coin/platform_configs/qtconnectivity.txt delete mode 100644 coin/platform_configs/qtdeclarative.txt delete mode 100644 coin/platform_configs/qtsaferenderer.txt delete mode 100644 coin/platform_configs/qtsdk.txt delete mode 100644 coin/platform_configs/qtwebkit.txt delete mode 100644 coin/platform_configs/tqtc-qt-rta.txt diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml new file mode 100644 index 00000000..5df190c4 --- /dev/null +++ b/coin/platform_configs/default.yaml @@ -0,0 +1,13 @@ +- Template: 'qtci-linux-Ubuntu-18.04-x86_64' + Compiler: 'GCC' + Features: ['DisableTests'] + Configure arguments: '-DBUILD_TESTING=OFF -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DBUILD_EXAMPLES=OFF -DCMAKE_INSTALL_PREFIX:PATH={{.InstallDir}} {{.SourceDir}}' +# Disabled for now +# - Template: 'qtci-macos-10.13-x86_64-2' +# Compiler: 'Clang' +# Features: ['DisableTests'] +# Configure arguments: '-DBUILD_TESTING=OFF -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DBUILD_EXAMPLES=OFF -DCMAKE_INSTALL_PREFIX:PATH={{.InstallDir}} -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode10.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.14.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.12 {{.SourceDir}}' +# - Template: 'qtci-windows-10-x86_64-14' +# Compiler: 'MSVC2017' +# Features: ['DisableTests'] +# Configure arguments: '-DBUILD_TESTING=OFF -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DBUILD_EXAMPLES=OFF -DCMAKE_INSTALL_PREFIX:PATH=c:{{.InstallDir}} -DCMAKE_TOOLCHAIN_FILE={{.Env.VCPKG_CMAKE_TOOLCHAIN_FILE}} -G NMake Makefiles JOM {{.SourceDir}}' diff --git a/coin/platform_configs/qt3d-runtime.txt b/coin/platform_configs/qt3d-runtime.txt deleted file mode 100644 index 1001d869..00000000 --- a/coin/platform_configs/qt3d-runtime.txt +++ /dev/null @@ -1,21 +0,0 @@ -Template Target OS Target arch Compiler Target Compiler Features ---------------------------- ------------------- ----------- ----------- --------------- ------------------------------------------------------------------------------------- -qtci-windows-10-x86_64-14 WinRT_10 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests -qtci-windows-10-x86_64-14 WinRT_10 x86 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests -qtci-windows-7-x86-3 Mingw73 Packaging DebugAndRelease Release OpenGLDynamic DisableTests -qtci-windows-10-x86_64-14 Mingw73 Packaging DebugAndRelease Release OpenGLDynamic DisableTests -qtci-windows-10-x86_64-14 WinRT_10 armv7 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests -qtci-windows-10-x86_64-14 WinRT_10 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests -qtci-linux-RHEL-7.4-x86_64 Android_ANY x86 GCC Clang Packaging Release DisableTests OpenGLES2 NoUseGoldLinker -qtci-windows-10-x86_64-14 Android_ANY armv7 Mingw73 Clang Packaging Release DisableTests OpenGLES2 -qtci-windows-10-x86_64-14 Android_ANY arm64 Mingw73 Clang Packaging Release DisableTests OpenGLES2 -qtci-windows-10-x86_64-14 Android_ANY x86 Mingw73 Clang Packaging Release DisableTests OpenGLES2 -qtci-macos-10.13-x86_64-2 Android_ANY armv7 Clang Clang Packaging Release DisableTests OpenGLES2 -qtci-macos-10.13-x86_64-2 Android_ANY arm64 Clang Clang Packaging Release DisableTests OpenGLES2 -qtci-macos-10.13-x86_64-2 Android_ANY x86 Clang Clang Packaging Release DisableTests OpenGLES2 -qtci-macos-10.13-x86_64-2 QNX_700 x86 GCC Release DisableTests OpenGLES2 NoUseGoldLinker -qtci-windows-10-x86_64-14 QNX_700 armv7 Mingw73 Packaging Release DisableTests OpenGLES2 -qtci-windows-10-x86_64-14 QNX_700 armv8 Mingw73 Packaging Release DisableTests OpenGLES2 -qtci-windows-10-x86_64-14 QNX_700 x86_64 Mingw73 Packaging Release DisableTests OpenGLES2 -qtci-linux-RHEL-7.4-x86_64 QNX_700 armv8 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker -qtci-linux-RHEL-7.4-x86_64 QNX_700 x86_64 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker diff --git a/coin/platform_configs/qtconnectivity.txt b/coin/platform_configs/qtconnectivity.txt deleted file mode 100644 index 15f11bd1..00000000 --- a/coin/platform_configs/qtconnectivity.txt +++ /dev/null @@ -1,3 +0,0 @@ -Template Target OS Target arch Compiler Features ---------------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- -qtci-windows-10-x86_64-14 WinRT_10 x86_64 MSVC2015 DeveloperBuild Static Release ForceDebugInfo diff --git a/coin/platform_configs/qtdeclarative.txt b/coin/platform_configs/qtdeclarative.txt deleted file mode 100644 index e2b69559..00000000 --- a/coin/platform_configs/qtdeclarative.txt +++ /dev/null @@ -1,4 +0,0 @@ -Template Target OS Target arch Compiler Features ---------------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- -qtci-linux-Ubuntu-18.04-x86_64 QEMU armv7 GCC DeveloperBuild -qtci-linux-Ubuntu-18.04-x86_64 QEMU arm64 GCC DeveloperBuild diff --git a/coin/platform_configs/qtsaferenderer.txt b/coin/platform_configs/qtsaferenderer.txt deleted file mode 100644 index ec14f610..00000000 --- a/coin/platform_configs/qtsaferenderer.txt +++ /dev/null @@ -1,3 +0,0 @@ -Template Target OS Target arch Compiler Features ------------------------------------ ------------------- ----------- ----------- ------------------------------------------------------------------------------------- -qtci-windows-10-x86_64-10 Mingw73 DeveloperBuild Release OpenGLDynamic BuildExamples diff --git a/coin/platform_configs/qtsdk.txt b/coin/platform_configs/qtsdk.txt deleted file mode 100644 index 3011926d..00000000 --- a/coin/platform_configs/qtsdk.txt +++ /dev/null @@ -1,4 +0,0 @@ -Template Target OS Target arch Compiler Features ---------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- -qtci-windows-10-x86-3 MSVC2017 Release ForceDebugInfo OpenGLDynamic -qtci-linux-RHEL-6.6-x86_64 GCC Release ForceDebugInfo diff --git a/coin/platform_configs/qtwebkit.txt b/coin/platform_configs/qtwebkit.txt deleted file mode 100644 index 27782f88..00000000 --- a/coin/platform_configs/qtwebkit.txt +++ /dev/null @@ -1,4 +0,0 @@ -Template Target OS Target arch Compiler Features ---------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- -qtci-windows-10-x86_64-14 x86 MSVC2017 DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests -qtci-windows-7-x86-3 Mingw73 Packaging DebugAndRelease Release OpenGLDynamic DisableTests diff --git a/coin/platform_configs/tqtc-qt-rta.txt b/coin/platform_configs/tqtc-qt-rta.txt deleted file mode 100644 index 8fbb5a00..00000000 --- a/coin/platform_configs/tqtc-qt-rta.txt +++ /dev/null @@ -1,6 +0,0 @@ -Template Target OS Target arch Compiler Features ---------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- -qtci-windows-7-x86_64-4 MSVC2013 Release ForceDebugInfo OpenGLDynamic DisableTests -qtci-windows-8.1-x86_64 MSVC2013 Release ForceDebugInfo OpenGLDynamic DisableTests -qtci-windows-10-x86-3 MSVC2017 Release ForceDebugInfo OpenGLDynamic - -- cgit v1.2.3 From 79bc4f077108237d31a4160d7f262f3c5966e35f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C4=99drzej=20Nowacki?= Date: Wed, 22 May 2019 16:23:00 +0200 Subject: Move some configure arguments to qtbase instructions These arguments are specific to the build and changes to them are _not_ affecting configuration. Change-Id: I701b7d83511c5f80b88c5aab09eae3ecb6df74a1 Reviewed-by: Liang Qi --- coin/platform_configs/default.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml index 5df190c4..e41c240b 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -1,13 +1,13 @@ - Template: 'qtci-linux-Ubuntu-18.04-x86_64' Compiler: 'GCC' Features: ['DisableTests'] - Configure arguments: '-DBUILD_TESTING=OFF -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DBUILD_EXAMPLES=OFF -DCMAKE_INSTALL_PREFIX:PATH={{.InstallDir}} {{.SourceDir}}' + Configure arguments: '-DBUILD_TESTING=OFF -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DBUILD_EXAMPLES=OFF' # Disabled for now # - Template: 'qtci-macos-10.13-x86_64-2' # Compiler: 'Clang' # Features: ['DisableTests'] -# Configure arguments: '-DBUILD_TESTING=OFF -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DBUILD_EXAMPLES=OFF -DCMAKE_INSTALL_PREFIX:PATH={{.InstallDir}} -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode10.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.14.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.12 {{.SourceDir}}' +# Configure arguments: '-DBUILD_TESTING=OFF -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DBUILD_EXAMPLES=OFF -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode10.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.14.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.12' # - Template: 'qtci-windows-10-x86_64-14' # Compiler: 'MSVC2017' # Features: ['DisableTests'] -# Configure arguments: '-DBUILD_TESTING=OFF -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DBUILD_EXAMPLES=OFF -DCMAKE_INSTALL_PREFIX:PATH=c:{{.InstallDir}} -DCMAKE_TOOLCHAIN_FILE={{.Env.VCPKG_CMAKE_TOOLCHAIN_FILE}} -G NMake Makefiles JOM {{.SourceDir}}' +# Configure arguments: '-DBUILD_TESTING=OFF -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DBUILD_EXAMPLES=OFF -DCMAKE_TOOLCHAIN_FILE={{.Env.VCPKG_CMAKE_TOOLCHAIN_FILE}} -G NMake Makefiles JOM' -- cgit v1.2.3 From aabcc8128cd8f74f082943b314c6e38de8b78919 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Thu, 23 May 2019 21:52:56 +0200 Subject: Provisioning: Add ninja to the list of installed packages Change-Id: I018e7812fc95c1db841720294a700a391246251d Reviewed-by: Alexandru Croitor --- coin/provisioning/qtci-macos-10.13-x86_64/26-ninja.sh | 5 +++++ 1 file changed, 5 insertions(+) create mode 100755 coin/provisioning/qtci-macos-10.13-x86_64/26-ninja.sh diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/26-ninja.sh b/coin/provisioning/qtci-macos-10.13-x86_64/26-ninja.sh new file mode 100755 index 00000000..c9d3e309 --- /dev/null +++ b/coin/provisioning/qtci-macos-10.13-x86_64/26-ninja.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env bash + +set -ex + +brew install ninja -- cgit v1.2.3 From 086439b018b2323a68b644986c0e2a7705fdaaf6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Micha=C3=ABl=20Celerier?= Date: Wed, 5 Jun 2019 11:12:48 +0200 Subject: Upgrade CMake to 3.15.0-rc1 Change-Id: I374631637a6521621dfa702aa2390998ef124d24 Reviewed-by: Simon Hausmann --- coin/provisioning/common/linux/cmake_linux.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/coin/provisioning/common/linux/cmake_linux.sh b/coin/provisioning/common/linux/cmake_linux.sh index 4a773c43..bfe7a9c5 100755 --- a/coin/provisioning/common/linux/cmake_linux.sh +++ b/coin/provisioning/common/linux/cmake_linux.sh @@ -42,11 +42,11 @@ source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh" # shellcheck source=../unix/SetEnvVar.sh source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" -majorminorversion="3.14" -version="3.14.0-rc3" +majorminorversion="3.15" +version="3.15.0-rc1" PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/cmake/cmake-$version-Linux-x86_64.tar.gz" AltUrl="https://cmake.org/files/v$majorminorversion/cmake-$version-Linux-x86_64.tar.gz" -SHA1="4dcd279a90aa7522c9a1d4be11b86395c5d1c729" +SHA1="5e4d2b4478485f1a16c91463fc91eea3a9487b7a" targetFolder="/opt/cmake-$version" appPrefix="cmake-$version-Linux-x86_64" -- cgit v1.2.3 From d44a7a5f145ebdd49e09da358850d102f089c0df Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Wed, 5 Jun 2019 14:39:44 +0200 Subject: Install cmake from binaries instead of from source MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The from-source installation originates from a point in time where there was no cmake release with binaries that were sufficient. That is not the case with 3.15-rc1. Change-Id: I385016969f21c194b25334e3af8af7283fc5873f Reviewed-by: Jędrzej Nowacki --- coin/provisioning/common/unix/install_cmake.sh | 72 ---------------------- .../40-install-cmake.sh | 2 +- 2 files changed, 1 insertion(+), 73 deletions(-) delete mode 100755 coin/provisioning/common/unix/install_cmake.sh diff --git a/coin/provisioning/common/unix/install_cmake.sh b/coin/provisioning/common/unix/install_cmake.sh deleted file mode 100755 index e76d2c6d..00000000 --- a/coin/provisioning/common/unix/install_cmake.sh +++ /dev/null @@ -1,72 +0,0 @@ -#!/usr/bin/env bash - -############################################################################# -## -## Copyright (C) 2019 The Qt Company Ltd. -## Contact: http://www.qt.io/licensing/ -## -## This file is part of the provisioning scripts 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$ -## -############################################################################# - -# shellcheck source=../unix/DownloadURL.sh -source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh" -# shellcheck source=../unix/SetEnvVar.sh -source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" - -set -ex - -# This script will install Cmake - -version="e1af2489fda9129e735007a069fae018c4ab3431" -sha1="357ad8003b30ec23037b59b750b96a75e52f78bb" -internalUrl="http://ci-files01-hki.intra.qt.io/input/cmake/CMake-$version.zip" -externalUrl="https://codeload.github.com/Kitware/CMake/zip/$version" - -targetDir="$HOME/CMake-$version" -targetFile="$targetDir.zip" -installFolder="$HOME" -cmakeHome="$HOME/cmake" -DownloadURL "$internalUrl" "$externalUrl" "$sha1" "$targetFile" -unzip "$targetFile" -d "$HOME" -sudo rm "$targetFile" - -echo "Configuring and building cmake" -cd "$targetDir" -if uname -a |grep -q Darwin; then - ./bootstrap --prefix="$(xcrun --sdk macosx --show-sdk-path)/usr/local" - SetEnvVar PATH "\$PATH:$(xcrun --sdk macosx --show-sdk-path)/usr/local/bin" -else - ./bootstrap --prefix="$cmakeHome" - SetEnvVar "PATH" "$cmakeHome/bin:\$PATH" -fi -make -sudo make install - -sudo rm -r "$targetDir" - -echo "CMake = $version" >> ~/versions.txt diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/40-install-cmake.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/40-install-cmake.sh index 0d799bff..cafbd3a5 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/40-install-cmake.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/40-install-cmake.sh @@ -1,5 +1,5 @@ #!/bin/bash BASEDIR=$(dirname "$0") -"$BASEDIR/../common/unix/install_cmake.sh" +"$BASEDIR/../common/linux/install_cmake.sh" -- cgit v1.2.3 From 463235a0bcdf42ece5be2d0b27dfb81cb46d5dfb Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Wed, 5 Jun 2019 14:46:03 +0200 Subject: Bump cmake to 3.15-rc1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Same as for the recent Linux change. Change-Id: I073411bcfa8cbd692a7770cdaad3a368c6f7108d Reviewed-by: Jędrzej Nowacki --- coin/provisioning/common/macos/cmake.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/coin/provisioning/common/macos/cmake.sh b/coin/provisioning/common/macos/cmake.sh index e22425b7..742422a0 100755 --- a/coin/provisioning/common/macos/cmake.sh +++ b/coin/provisioning/common/macos/cmake.sh @@ -42,10 +42,10 @@ source "${BASH_SOURCE%/*}/InstallAppFromCompressedFileFromURL.sh" # shellcheck source=../unix/SetEnvVar.sh source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" -PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/macos_10.13_high_sierra/cmake-3.11.3-Darwin-x86_64.tar.gz" -AltUrl="https://cmake.org/files/v3.11/cmake-3.11.3-Darwin-x86_64.tar.gz" -SHA1="3d13de8020ce560159fa5cecb669498c48552d96" -appPrefix="cmake-3.11.3-Darwin-x86_64" +PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/macos_10.13_high_sierra/cmake-3.15.0-rc1-Darwin-x86_64.tar.gz" +AltUrl="https://cmake.org/files/v3.15/cmake-3.15.0-rc1-Darwin-x86_64.tar.gz" +SHA1="94b6aa5f36fd20811eb6c5c036bb2ec154f2d652" +appPrefix="cmake-3.15.0-rc1-Darwin-x86_64" InstallAppFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$appPrefix" -- cgit v1.2.3 From 716cb8185a769265cf1fd3f88926bfce4cb5361b Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Thu, 6 Jun 2019 08:57:36 +0200 Subject: Fix path to cmake installation script Amends commit d44a7a5f145ebdd49e09da358850d102f089c0df Change-Id: I52926a8e8c488beaeb70c9bf0222c7caa0ccfe9c Reviewed-by: Simon Hausmann --- coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/40-install-cmake.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/40-install-cmake.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/40-install-cmake.sh index cafbd3a5..db8a3ff5 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/40-install-cmake.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/40-install-cmake.sh @@ -1,5 +1,5 @@ #!/bin/bash BASEDIR=$(dirname "$0") -"$BASEDIR/../common/linux/install_cmake.sh" +"$BASEDIR/../common/linux/cmake_linux.sh" -- cgit v1.2.3 From 36d634a7dd2d588d8a0d113ac684a57410162041 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C4=99drzej=20Nowacki?= Date: Thu, 6 Jun 2019 09:26:27 +0200 Subject: Fix paths when installing cmake on macOS MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This ammends d44a7a5f145ebdd49e09da358850d102f089c0df. Change-Id: I8e8644a1f8677e6e62fb6356cc6c3533ec40e454 Reviewed-by: Jędrzej Nowacki --- coin/provisioning/qtci-macos-10.13-x86_64/25-install-cmake.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/25-install-cmake.sh b/coin/provisioning/qtci-macos-10.13-x86_64/25-install-cmake.sh index a87667fe..4f4d405e 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/25-install-cmake.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/25-install-cmake.sh @@ -3,4 +3,4 @@ set -ex BASEDIR=$(dirname "$0") -"$BASEDIR/../common/unix/install_cmake.sh" +"$BASEDIR/../common/macos/cmake.sh" -- cgit v1.2.3 From 7df4f93cb1fb9d09c40850d351ebd24eaa94c5c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C4=99drzej=20Nowacki?= Date: Thu, 6 Jun 2019 09:33:40 +0200 Subject: Fix provisioning of cmake on macOS MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The script contains a bit of data duplication, one of the fields was not updated. This amends 463235a0bcdf42ece5be2d0b27dfb81cb46d5dfb. Change-Id: Idb9e88eba1f1415a0ca29f2c3a003c8a844bb024 Reviewed-by: Jędrzej Nowacki --- coin/provisioning/common/macos/cmake.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/provisioning/common/macos/cmake.sh b/coin/provisioning/common/macos/cmake.sh index 742422a0..ed49de81 100755 --- a/coin/provisioning/common/macos/cmake.sh +++ b/coin/provisioning/common/macos/cmake.sh @@ -51,4 +51,4 @@ InstallAppFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$appPrefix" SetEnvVar "PATH" "/Applications/CMake.app/Contents/bin:\$PATH" -echo "CMake = 3.11.3" >> ~/versions.txt +echo "CMake = 3.15.0-rc1" >> ~/versions.txt -- cgit v1.2.3 From a6d159c9e714a6b743ae13b96e2ebcd241c50a01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C4=99drzej=20Nowacki?= Date: Thu, 6 Jun 2019 09:48:28 +0200 Subject: Bump cmake to 3.15-rc1 on Windows Same as for the recent Linux and macOS change. Change-Id: Ic7ae30333f8cd58925f697c19ca046ceac49cd32 Reviewed-by: Simon Hausmann --- coin/provisioning/common/windows/cmake.ps1 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/coin/provisioning/common/windows/cmake.ps1 b/coin/provisioning/common/windows/cmake.ps1 index 1c19c980..cc7015a8 100644 --- a/coin/provisioning/common/windows/cmake.ps1 +++ b/coin/provisioning/common/windows/cmake.ps1 @@ -33,8 +33,8 @@ . "$PSScriptRoot\helpers.ps1" -$majorminorversion = "3.14" -$version = "3.14.1" +$majorminorversion = "3.15" +$version = "3.15.0-rc1" $zip = Get-DownloadLocation ("cmake-" + $version + "-win32-x86.zip") $officialurl = "https://cmake.org/files/v" + $majorminorversion + "/cmake-" + $version + "-win32-x86.zip" @@ -44,7 +44,7 @@ Write-Host "Removing old cmake" Remove-Item "C:\CMake" -Force -Recurse -ErrorAction SilentlyContinue Download $officialurl $cachedurl $zip -Verify-Checksum $zip "C1626FD07B09C76736F5AC9DA7B4374919EB9964" +Verify-Checksum $zip "F196900509D7CA1947F04084DB8BEAA1DB1F7B59" Extract-7Zip $zip C: $defaultinstallfolder = "C:\cmake-" + $version + "-win32-x86" -- cgit v1.2.3 From 2e5b5cc075bb03e1f28dcc02b29296ad50c3e1fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C4=99drzej=20Nowacki?= Date: Thu, 6 Jun 2019 15:50:22 +0200 Subject: Update cmake sha1 for Windows MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It amends a6d159c9e714a6b743ae13b96e2ebcd241c50a01. Seems that I computed sha1 for a wrong file. Change-Id: Ie524b2c825189a91cd6b809ff7991af20bd301b1 Reviewed-by: Jędrzej Nowacki --- coin/provisioning/common/windows/cmake.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/provisioning/common/windows/cmake.ps1 b/coin/provisioning/common/windows/cmake.ps1 index cc7015a8..3367440b 100644 --- a/coin/provisioning/common/windows/cmake.ps1 +++ b/coin/provisioning/common/windows/cmake.ps1 @@ -44,7 +44,7 @@ Write-Host "Removing old cmake" Remove-Item "C:\CMake" -Force -Recurse -ErrorAction SilentlyContinue Download $officialurl $cachedurl $zip -Verify-Checksum $zip "F196900509D7CA1947F04084DB8BEAA1DB1F7B59" +Verify-Checksum $zip "3739F2FF0CAD6EC15475A32D419EBEB0864C4800" Extract-7Zip $zip C: $defaultinstallfolder = "C:\cmake-" + $version + "-win32-x86" -- cgit v1.2.3 From 8f2b2dba786e28429a207c209190d5a260981e05 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Wed, 22 May 2019 14:08:10 +0200 Subject: Enable windows and macOS builds for yaml and cmake MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I91aea0fe59e77cf95f7441c646e95d038f0e0032 Reviewed-by: Jędrzej Nowacki --- coin/platform_configs/default.yaml | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml index e41c240b..ddb6b725 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -2,12 +2,11 @@ Compiler: 'GCC' Features: ['DisableTests'] Configure arguments: '-DBUILD_TESTING=OFF -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DBUILD_EXAMPLES=OFF' -# Disabled for now -# - Template: 'qtci-macos-10.13-x86_64-2' -# Compiler: 'Clang' -# Features: ['DisableTests'] -# Configure arguments: '-DBUILD_TESTING=OFF -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DBUILD_EXAMPLES=OFF -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode10.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.14.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.12' -# - Template: 'qtci-windows-10-x86_64-14' -# Compiler: 'MSVC2017' -# Features: ['DisableTests'] -# Configure arguments: '-DBUILD_TESTING=OFF -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DBUILD_EXAMPLES=OFF -DCMAKE_TOOLCHAIN_FILE={{.Env.VCPKG_CMAKE_TOOLCHAIN_FILE}} -G NMake Makefiles JOM' +- Template: 'qtci-macos-10.13-x86_64-2' + Compiler: 'Clang' + Features: ['DisableTests'] + Configure arguments: '-DBUILD_TESTING=OFF -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DBUILD_EXAMPLES=OFF -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode10.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.14.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.12' +- Template: 'qtci-windows-10-x86_64-14' + Compiler: 'MSVC2017' + Features: ['DisableTests'] + Configure arguments: '-DBUILD_TESTING=OFF -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DBUILD_EXAMPLES=OFF -DCMAKE_TOOLCHAIN_FILE={{.Env.VCPKG_CMAKE_TOOLCHAIN_FILE}} -DCMAKE_C_COMPILER=cl.exe -DCMAKE_CXX_COMPILER=cl.exe -DFEATURE_freetype=OFF' -- cgit v1.2.3 From cfd35cc49849643ce2e1b37c8bebcf0acca8f2bb Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Wed, 12 Jun 2019 16:11:56 +0200 Subject: Add a new Linux config that builds a static developer build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I8e40ed674cf0a72223a0180296db8eaa6eb6da06 Reviewed-by: Jędrzej Nowacki --- coin/platform_configs/default.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml index ddb6b725..1a2df74f 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -2,6 +2,10 @@ Compiler: 'GCC' Features: ['DisableTests'] Configure arguments: '-DBUILD_TESTING=OFF -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DBUILD_EXAMPLES=OFF' +- Template: 'qtci-linux-Ubuntu-18.04-x86_64' + Compiler: 'GCC' + Features: ['DisableTests'] + Configure arguments: '-DBUILD_TESTING=OFF -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DBUILD_EXAMPLES=OFF -DFEATURE_developer_build=ON -DBUILD_SHARED_LIBS=OFF' - Template: 'qtci-macos-10.13-x86_64-2' Compiler: 'Clang' Features: ['DisableTests'] -- cgit v1.2.3 From b62c39f49f7dbf15df282bce2b4f5126dd68b885 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C4=99drzej=20Nowacki?= Date: Wed, 12 Jun 2019 17:03:44 +0200 Subject: Increase CI test coverage by changing GCC to ICC There is already other place in which we compile with GCC on Linux. As we use ninja now, it has to be installed on open suse too. Cmake port depends on system libraries therefore pcre2 needs to be installed. Change-Id: I92e16cc31fa60b4c591e71b58cd7235540065ac6 Reviewed-by: Liang Qi --- coin/platform_configs/default.yaml | 6 +++--- .../qtci-linux-openSUSE-15.0-x86_64/02-zypperpackages.sh | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml index 1a2df74f..f5daef6d 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -2,10 +2,10 @@ Compiler: 'GCC' Features: ['DisableTests'] Configure arguments: '-DBUILD_TESTING=OFF -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DBUILD_EXAMPLES=OFF' -- Template: 'qtci-linux-Ubuntu-18.04-x86_64' - Compiler: 'GCC' +- Template: 'qtci-linux-openSUSE-15.0-x86_64' + Compiler: 'ICC_18' Features: ['DisableTests'] - Configure arguments: '-DBUILD_TESTING=OFF -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DBUILD_EXAMPLES=OFF -DFEATURE_developer_build=ON -DBUILD_SHARED_LIBS=OFF' + Configure arguments: '-DBUILD_TESTING=OFF -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DBUILD_EXAMPLES=OFF -DFEATURE_developer_build=ON -DBUILD_SHARED_LIBS=OFF -DCMAKE_C_COMPILER=icc -DCMAKE_CXX_COMPILER=icpc' - Template: 'qtci-macos-10.13-x86_64-2' Compiler: 'Clang' Features: ['DisableTests'] diff --git a/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/02-zypperpackages.sh b/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/02-zypperpackages.sh index d1f3050f..9da9ed0f 100755 --- a/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/02-zypperpackages.sh +++ b/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/02-zypperpackages.sh @@ -2,7 +2,7 @@ set -ex -sudo zypper -nq install git gcc7 gcc7-c++ +sudo zypper -nq install git gcc7 gcc7-c++ ninja sudo /usr/sbin/update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-7 1 \ --slave /usr/bin/g++ g++ /usr/bin/g++-7 \ --slave /usr/bin/cc cc /usr/bin/gcc-7 \ @@ -17,7 +17,8 @@ sudo zypper -nq install bison flex gperf \ fontconfig-devel \ sqlite3-devel \ libxkbcommon-devel \ - libxkbcommon-x11-devel + libxkbcommon-x11-devel \ + pcre2-devel libpng16-devel # EGL support sudo zypper -nq install Mesa-libEGL-devel Mesa-libGL-devel -- cgit v1.2.3 From cd8c1032c3af1380a91b3cb08a5b647bd21407a0 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Mon, 17 Jun 2019 13:33:18 +0200 Subject: Update qtbase on 'wip/cmake' in qt5 Change-Id: Ibe0281f5558efb8e0c1f00b17af367173331e30a Reviewed-by: Liang Qi --- qtbase | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtbase b/qtbase index 5c98110f..aaa7ce46 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 5c98110fca071f4c0c8bcc68b8d8e12b96a0fce2 +Subproject commit aaa7ce460a67737b6a279db12442595a815aee90 -- cgit v1.2.3 From b53dfe6a8645bf185f3eaa69f2c8b8559ac32143 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 20 Jun 2019 09:46:00 +0200 Subject: Update submodules on 'wip/cmake' in qt5 Change-Id: If09d644bb84c83a515a68bada24ab0203a6c6003 Reviewed-by: Liang Qi --- qtbase | 2 +- qtrepotools | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qtbase b/qtbase index aaa7ce46..264d3bc9 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit aaa7ce460a67737b6a279db12442595a815aee90 +Subproject commit 264d3bc9ba886b3e71dc3bad98a382c0b090c2ce diff --git a/qtrepotools b/qtrepotools index f9c6da38..61191bf3 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit f9c6da38f70d9bf95937a5de8269e0f8d52600a4 +Subproject commit 61191bf37d3e03f190943725c2c99d9c5fcb3fdf -- cgit v1.2.3 From 9d7437859b2297481db267a5e307e0a3a362c9dd Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Thu, 20 Jun 2019 14:56:52 +0200 Subject: Update vcpkg installation Use the latest snapshot, fetch the package set from the repo itself and set the VCPKG_ROOT environment variable as that's the vcpkg documented interface. The qt specific triplet defaults to static linkage, which allows removing the %PATH% handling and resembles the same setup as in Qt 5 where we linked the 3rd-party code statically into qt. Change-Id: I789d61b5c7258674c2dd80403efaeb891c8f75c7 Reviewed-by: Liang Qi --- coin/platform_configs/default.yaml | 2 +- coin/provisioning/common/windows/install-vcpkg.ps1 | 41 +++++++++++----------- 2 files changed, 22 insertions(+), 21 deletions(-) diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml index f5daef6d..a2e397b1 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -13,4 +13,4 @@ - Template: 'qtci-windows-10-x86_64-14' Compiler: 'MSVC2017' Features: ['DisableTests'] - Configure arguments: '-DBUILD_TESTING=OFF -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DBUILD_EXAMPLES=OFF -DCMAKE_TOOLCHAIN_FILE={{.Env.VCPKG_CMAKE_TOOLCHAIN_FILE}} -DCMAKE_C_COMPILER=cl.exe -DCMAKE_CXX_COMPILER=cl.exe -DFEATURE_freetype=OFF' + Configure arguments: '-DBUILD_TESTING=OFF -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DBUILD_EXAMPLES=OFF -DCMAKE_TOOLCHAIN_FILE={{.Env.VCPKG_ROOT}}/scripts/buildsystems/vcpkg.cmake -DCMAKE_C_COMPILER=cl.exe -DCMAKE_CXX_COMPILER=cl.exe -DFEATURE_freetype=OFF' diff --git a/coin/provisioning/common/windows/install-vcpkg.ps1 b/coin/provisioning/common/windows/install-vcpkg.ps1 index 673274da..36b0d826 100644 --- a/coin/provisioning/common/windows/install-vcpkg.ps1 +++ b/coin/provisioning/common/windows/install-vcpkg.ps1 @@ -34,32 +34,33 @@ # This script will install vcpkg -$version = "08ad9d88ecabf9f8111bd4df0ca74723550503cd" -$sha1 = "43b471aebc2f46bee00c86710d0311ef6fb7bb19" -$officialUrl = "https://codeload.github.com/liangqi/vcpkg/zip/qt" -$cachedUrl = "http://ci-files01-hki.ci.local/input/vcpkg/vcpkg-$version.zip" -$zip = "C:\Utils\vcpkg-$version.zip" -$installationFolder = "C:\Utils\vcpkg" - Write-Host "Installing vcpkg" -Download "$officialUrl" "$cachedUrl" "$zip" -Verify-Checksum "$zip" "$sha1" -Extract-7Zip "$zip" C:\Utils -cmd /c mklink /d "$installationFolder" "C:\Utils\vcpkg-qt" -cd "C:\Utils\vcpkg-qt\" -cmd /c "`"C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Professional\\VC\\Auxiliary\\Build\\vcvars64.bat`" && bootstrap-vcpkg.bat" + +$version = "qt-snapshot-2019-06-20" +$officialUrl = "https://codeload.github.com/tronical/vcpkg/zip/$version" +$zip = "C:\Utils\vcpkg.zip" + +Download "$officialUrl" "" "$zip" +Extract-7Zip "$zip" c:\utils +Remove-Item $zip + +$installationFolder = "c:\utils\vcpkg-$version" + +cd $installationFolder + +cmd /c bootstrap-vcpkg.bat if(![System.IO.File]::Exists("$installationFolder\vcpkg.exe")){ Write-Host "Can't find $installationFolder\vcpkg.exe. Installation probably failed!" exit 1 } -Set-EnvironmentVariable VCPKG_DEFAULT_TRIPLET "x64-windows" -Set-EnvironmentVariable VCPKG_CMAKE_TOOLCHAIN_FILE "$installationFolder\scripts\buildsystems\vcpkg.cmake" - -# pcre2-16.dll was used when generating qvulkanfunctions.h -Add-Path "C:\Utils\vcpkg\installed\x64-windows\bin" +Set-EnvironmentVariable VCPKG_DEFAULT_TRIPLET "qt-x64-windows-static" +Set-EnvironmentVariable VCPKG_ROOT "$installationFolder" -cmd /c "`"C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Professional\\VC\\Auxiliary\\Build\\vcvars64.bat`" && $installationFolder\vcpkg.exe --triplet x64-windows install zlib pcre2 double-conversion harfbuzz openssl" +cmd /c $installationFolder\vcpkg.exe install --triplet qt-x64-windows-static @qt-packages-windows.txt +cmd /c $installationFolder\vcpkg.exe install --triplet qt-x86-windows-static @qt-packages-windows.txt -Remove-Item "$zip" +Remove-Item -Recurse -Force packages +Remove-Item -Recurse -Force buildtrees +Remove-Item -Recurse -Force downloads -- cgit v1.2.3 From 5464a31c6109b7f8af87c65b111dbae379e77b0d Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Fri, 21 Jun 2019 13:35:17 +0200 Subject: Enable freetype on the Windows build With the newer vcpkg this works now. Change-Id: I8408041b338ffbe74aaec9afbb1cf8cbf3bb1d92 Reviewed-by: Liang Qi --- coin/platform_configs/default.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml index a2e397b1..ac724225 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -13,4 +13,4 @@ - Template: 'qtci-windows-10-x86_64-14' Compiler: 'MSVC2017' Features: ['DisableTests'] - Configure arguments: '-DBUILD_TESTING=OFF -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DBUILD_EXAMPLES=OFF -DCMAKE_TOOLCHAIN_FILE={{.Env.VCPKG_ROOT}}/scripts/buildsystems/vcpkg.cmake -DCMAKE_C_COMPILER=cl.exe -DCMAKE_CXX_COMPILER=cl.exe -DFEATURE_freetype=OFF' + Configure arguments: '-DBUILD_TESTING=OFF -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DBUILD_EXAMPLES=OFF -DCMAKE_TOOLCHAIN_FILE={{.Env.VCPKG_ROOT}}/scripts/buildsystems/vcpkg.cmake -DCMAKE_C_COMPILER=cl.exe -DCMAKE_CXX_COMPILER=cl.exe' -- cgit v1.2.3 From 61d838e4f03f8daf61b2e1eecd3d343cd85f5f3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C4=99drzej=20Nowacki?= Date: Fri, 21 Jun 2019 13:56:25 +0200 Subject: Move ICC compiler name setup to instructions level That way we can simplify product level configuration. Change-Id: Ib855c1873d3b4566b437845ab18182a0db8e45b9 Reviewed-by: Simon Hausmann --- coin/platform_configs/default.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml index ac724225..3d347ae6 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -5,7 +5,7 @@ - Template: 'qtci-linux-openSUSE-15.0-x86_64' Compiler: 'ICC_18' Features: ['DisableTests'] - Configure arguments: '-DBUILD_TESTING=OFF -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DBUILD_EXAMPLES=OFF -DFEATURE_developer_build=ON -DBUILD_SHARED_LIBS=OFF -DCMAKE_C_COMPILER=icc -DCMAKE_CXX_COMPILER=icpc' + Configure arguments: '-DBUILD_TESTING=OFF -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DBUILD_EXAMPLES=OFF -DFEATURE_developer_build=ON -DBUILD_SHARED_LIBS=OFF' - Template: 'qtci-macos-10.13-x86_64-2' Compiler: 'Clang' Features: ['DisableTests'] -- cgit v1.2.3 From 245f5afd718b042c7733fddbacb767c719af81b3 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Mon, 24 Jun 2019 13:32:04 +0200 Subject: Remove DisableTests in features MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit At least we can get tests built now. Change-Id: I7830f495002083023651ca5da3c6c39e745f920f Reviewed-by: Jędrzej Nowacki --- coin/platform_configs/default.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml index 3d347ae6..7e5e159a 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -1,16 +1,12 @@ - Template: 'qtci-linux-Ubuntu-18.04-x86_64' Compiler: 'GCC' - Features: ['DisableTests'] Configure arguments: '-DBUILD_TESTING=OFF -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DBUILD_EXAMPLES=OFF' - Template: 'qtci-linux-openSUSE-15.0-x86_64' Compiler: 'ICC_18' - Features: ['DisableTests'] Configure arguments: '-DBUILD_TESTING=OFF -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DBUILD_EXAMPLES=OFF -DFEATURE_developer_build=ON -DBUILD_SHARED_LIBS=OFF' - Template: 'qtci-macos-10.13-x86_64-2' Compiler: 'Clang' - Features: ['DisableTests'] Configure arguments: '-DBUILD_TESTING=OFF -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DBUILD_EXAMPLES=OFF -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode10.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.14.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.12' - Template: 'qtci-windows-10-x86_64-14' Compiler: 'MSVC2017' - Features: ['DisableTests'] Configure arguments: '-DBUILD_TESTING=OFF -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DBUILD_EXAMPLES=OFF -DCMAKE_TOOLCHAIN_FILE={{.Env.VCPKG_ROOT}}/scripts/buildsystems/vcpkg.cmake -DCMAKE_C_COMPILER=cl.exe -DCMAKE_CXX_COMPILER=cl.exe' -- cgit v1.2.3 From 0ec119a44281836930a41eeec5df41da388b837d Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 24 Jun 2019 13:34:00 +0200 Subject: Update submodules on 'wip/cmake' in qt5 Change-Id: Id5266aa8146f6d870fdddedc106d7ef1add5d5c6 Reviewed-by: Liang Qi --- qtbase | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtbase b/qtbase index 264d3bc9..cccc9fc5 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 264d3bc9ba886b3e71dc3bad98a382c0b090c2ce +Subproject commit cccc9fc59be715b920c7bcaef327b06bbbbbfa99 -- cgit v1.2.3 From d3e2f494fd6875a0ab559b305b0e213034e11b8a Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 26 Jun 2019 10:58:32 +0200 Subject: Update submodules on 'wip/cmake' in qt5 Change-Id: Ia666fc2c946e00b901bd225e06c455474591f7f1 Reviewed-by: Liang Qi --- qtbase | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtbase b/qtbase index cccc9fc5..a9d2c5b6 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit cccc9fc59be715b920c7bcaef327b06bbbbbfa99 +Subproject commit a9d2c5b6d7fa6b7365db8690f57aa78002c8bc4b -- cgit v1.2.3 From 36c9379e073b9d302b9d850508d1fbd896c77918 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 27 Jun 2019 09:53:41 +0200 Subject: Update submodules on 'wip/cmake' in qt5 Change-Id: Ic264dee2452ffc8b58609f5114444b49488d951b Reviewed-by: Liang Qi --- qtbase | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtbase b/qtbase index a9d2c5b6..f8c52530 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit a9d2c5b6d7fa6b7365db8690f57aa78002c8bc4b +Subproject commit f8c52530f7eedbfa7b106ef457a09005d586d926 -- cgit v1.2.3 From 8e54519b754be4117abe26a5ef3343e90fd01366 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C4=99drzej=20Nowacki?= Date: Mon, 1 Jul 2019 16:53:49 +0200 Subject: Do not specify compiler binary name directly We have a code that handles that implicitly so it is not needed anymore. Change-Id: I4aea2f55f9efd24ec7cf22cb8b413789ec3e7fea Reviewed-by: Liang Qi --- coin/platform_configs/default.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml index 7e5e159a..deac4991 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -9,4 +9,4 @@ Configure arguments: '-DBUILD_TESTING=OFF -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DBUILD_EXAMPLES=OFF -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode10.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.14.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.12' - Template: 'qtci-windows-10-x86_64-14' Compiler: 'MSVC2017' - Configure arguments: '-DBUILD_TESTING=OFF -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DBUILD_EXAMPLES=OFF -DCMAKE_TOOLCHAIN_FILE={{.Env.VCPKG_ROOT}}/scripts/buildsystems/vcpkg.cmake -DCMAKE_C_COMPILER=cl.exe -DCMAKE_CXX_COMPILER=cl.exe' + Configure arguments: '-DBUILD_TESTING=OFF -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DBUILD_EXAMPLES=OFF -DCMAKE_TOOLCHAIN_FILE={{.Env.VCPKG_ROOT}}/scripts/buildsystems/vcpkg.cmake' -- cgit v1.2.3 From caacdfc3e103e90a60eb3056a21ff1dbd6c5c380 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C4=99drzej=20Nowacki?= Date: Tue, 2 Jul 2019 15:42:19 +0200 Subject: Remove "-DBUILD_TESTING=OFF" from default configs It is not needed. QtBase build instructions add it explicitly, as the tests are build with a separate cmake call (to compile tests against differently installed Qt). Change-Id: I22fe26d4bdb9dd237df76246607d823f4b4fa315 Reviewed-by: Liang Qi --- coin/platform_configs/default.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml index deac4991..667b081f 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -1,12 +1,12 @@ - Template: 'qtci-linux-Ubuntu-18.04-x86_64' Compiler: 'GCC' - Configure arguments: '-DBUILD_TESTING=OFF -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DBUILD_EXAMPLES=OFF' + Configure arguments: '-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DBUILD_EXAMPLES=OFF' - Template: 'qtci-linux-openSUSE-15.0-x86_64' Compiler: 'ICC_18' - Configure arguments: '-DBUILD_TESTING=OFF -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DBUILD_EXAMPLES=OFF -DFEATURE_developer_build=ON -DBUILD_SHARED_LIBS=OFF' + Configure arguments: '-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DBUILD_EXAMPLES=OFF -DFEATURE_developer_build=ON -DBUILD_SHARED_LIBS=OFF' - Template: 'qtci-macos-10.13-x86_64-2' Compiler: 'Clang' - Configure arguments: '-DBUILD_TESTING=OFF -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DBUILD_EXAMPLES=OFF -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode10.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.14.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.12' + Configure arguments: '-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DBUILD_EXAMPLES=OFF -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode10.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.14.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.12' - Template: 'qtci-windows-10-x86_64-14' Compiler: 'MSVC2017' - Configure arguments: '-DBUILD_TESTING=OFF -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DBUILD_EXAMPLES=OFF -DCMAKE_TOOLCHAIN_FILE={{.Env.VCPKG_ROOT}}/scripts/buildsystems/vcpkg.cmake' + Configure arguments: '-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DBUILD_EXAMPLES=OFF -DCMAKE_TOOLCHAIN_FILE={{.Env.VCPKG_ROOT}}/scripts/buildsystems/vcpkg.cmake' -- cgit v1.2.3 From 084bc8e03d965641e4088dff0b8e67360a2dedc7 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 2 Jul 2019 22:57:58 +0200 Subject: Update submodules on 'wip/cmake' in qt5 Change-Id: I982d2416a488f18dc672089e9618db04422cf49f Reviewed-by: Liang Qi --- qtbase | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtbase b/qtbase index f8c52530..d9da52d5 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit f8c52530f7eedbfa7b106ef457a09005d586d926 +Subproject commit d9da52d5616fed6f1d48422d82f23ad3dae946a9 -- cgit v1.2.3 From 3d257d44691ffe3b7aca96c9cc1f867695c0ed7b Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 4 Jul 2019 13:56:51 +0200 Subject: Update submodules on 'wip/cmake' in qt5 Change-Id: I30e47f20800449cf0e808dc467f88c56a106a7ee Reviewed-by: Liang Qi --- qtbase | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtbase b/qtbase index d9da52d5..12b73cba 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit d9da52d5616fed6f1d48422d82f23ad3dae946a9 +Subproject commit 12b73cba89c7564ba33bf6139f67b135522248ce -- cgit v1.2.3 From 483aff91d51fd792bbc25d202580642ee3890437 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 22 Jul 2019 12:36:02 +0200 Subject: Update submodules on 'wip/cmake' in qt5 Change-Id: I3026b396baf1de58d44335c72d94fa42ef11e2ae Reviewed-by: Liang Qi --- qtbase | 2 +- qtrepotools | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qtbase b/qtbase index 12b73cba..ff5a75a6 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 12b73cba89c7564ba33bf6139f67b135522248ce +Subproject commit ff5a75a60e5886e52b262f20750bd769ec5d88ac diff --git a/qtrepotools b/qtrepotools index 61191bf3..da0a7744 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 61191bf37d3e03f190943725c2c99d9c5fcb3fdf +Subproject commit da0a7744065b2c1cc7660f4fcf6d9e253f490eca -- cgit v1.2.3 From caf72a3e611e6c7d63be47d5fa11a6377305cc74 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 26 Jul 2019 10:35:13 +0200 Subject: Update submodules on 'wip/cmake' in qt5 Change-Id: I4314ca80f344975b9cb01dbd7d26a2b66149f8d8 Reviewed-by: Liang Qi --- qtbase | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtbase b/qtbase index ff5a75a6..88bf485f 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit ff5a75a60e5886e52b262f20750bd769ec5d88ac +Subproject commit 88bf485f9198d13d69e3076f6d8924582624e88e -- cgit v1.2.3 From b7cf9cc2574ee72d5a2b255632672eeab2c5cdd3 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 31 Jul 2019 13:24:00 +0200 Subject: Update submodules on 'wip/cmake' in qt5 Change-Id: I1db600010615f24d6b35c5d6740494422cb917f6 Reviewed-by: Liang Qi --- qtbase | 2 +- qtrepotools | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qtbase b/qtbase index 88bf485f..517a0ea8 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 88bf485f9198d13d69e3076f6d8924582624e88e +Subproject commit 517a0ea8f01c1ffab06db11ed3a5beeee53bd738 diff --git a/qtrepotools b/qtrepotools index da0a7744..9d734113 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit da0a7744065b2c1cc7660f4fcf6d9e253f490eca +Subproject commit 9d73411360b154e8d415b08dc0c295592a8adc00 -- cgit v1.2.3 From 139e8e47018758807a20415b6e81d47185974d05 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 4 Aug 2019 11:55:19 +0200 Subject: Update submodules on 'wip/cmake' in qt5 Change-Id: I5440f3860baca1ca151a0e35f835103c596a1e1c Reviewed-by: Liang Qi --- qtbase | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtbase b/qtbase index 517a0ea8..ad0e3e26 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 517a0ea8f01c1ffab06db11ed3a5beeee53bd738 +Subproject commit ad0e3e26fabe0574889c5cf3a26a145a7f5d9c98 -- cgit v1.2.3 From 30ca64e65bde396a7994d4c72199de38a280acb5 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 7 Aug 2019 14:38:18 +0200 Subject: Update submodules on 'wip/cmake' in qt5 Change-Id: I85cbd5003e89b2b2af2237dd6a5489b45057e3c2 Reviewed-by: Liang Qi --- qtbase | 2 +- qtrepotools | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qtbase b/qtbase index ad0e3e26..f9db9a22 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit ad0e3e26fabe0574889c5cf3a26a145a7f5d9c98 +Subproject commit f9db9a22e9f0d35d8ecaf60b744e663efdd9ea3f diff --git a/qtrepotools b/qtrepotools index 9d734113..157ec79c 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 9d73411360b154e8d415b08dc0c295592a8adc00 +Subproject commit 157ec79c64c8aba721536a4f06f656a2af15d4d3 -- cgit v1.2.3 From af7097ed425824ccf24702e8c67daa88bcd568b6 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 11 Aug 2019 23:01:07 +0200 Subject: Update submodules on 'wip/cmake' in qt5 Change-Id: Ie79c40427bf35051b853df9209cee16ad15de0fd Reviewed-by: Liang Qi --- qtbase | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtbase b/qtbase index f9db9a22..17209701 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit f9db9a22e9f0d35d8ecaf60b744e663efdd9ea3f +Subproject commit 1720970102836c20383b192fca6dbc17ee743392 -- cgit v1.2.3 From 48b228f728f0653e4a66172864475b154dfd4caa Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 16 Aug 2019 09:41:59 +0200 Subject: Update submodules on 'wip/cmake' in qt5 Change-Id: Id919678e8e69dfe3c80d43fa9dbd10df7f02462d Reviewed-by: Liang Qi --- qtbase | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtbase b/qtbase index 17209701..1291e8d0 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 1720970102836c20383b192fca6dbc17ee743392 +Subproject commit 1291e8d09404716b5ade2ac283f8f30efba93187 -- cgit v1.2.3 From bbf5272c81aa3df90bf412586c9ff0f131484255 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 22 Aug 2019 07:13:04 +0200 Subject: Update submodules on 'wip/cmake' in qt5 Change-Id: I1fef265d608fd7729f8f3493d11660dce0502406 Reviewed-by: Liang Qi --- qtbase | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtbase b/qtbase index 1291e8d0..3cb9ee3a 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 1291e8d09404716b5ade2ac283f8f30efba93187 +Subproject commit 3cb9ee3a5b36e2c10dbaf1564852472e7e02a1ae -- cgit v1.2.3 From 21bcce41eb865100af829163760a11eb6b66a932 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 24 Aug 2019 10:21:31 +0200 Subject: Update submodules on 'wip/cmake' in qt5 Change-Id: I45e93ee3d0f5e0ada30608cc9d3b459b9c594a56 Reviewed-by: Liang Qi --- qtbase | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtbase b/qtbase index 3cb9ee3a..753e7c10 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 3cb9ee3a5b36e2c10dbaf1564852472e7e02a1ae +Subproject commit 753e7c10619427f7f5b0ae89379717f9a163d546 -- cgit v1.2.3 From 9828fd1d7beac8bda4d9336f9ae59949475613b2 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 29 Aug 2019 07:53:19 +0200 Subject: Update submodules on 'wip/cmake' in qt5 Change-Id: If619405e5fb6aed8b4c2e9829514825e785d37b5 Reviewed-by: Liang Qi --- qtbase | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtbase b/qtbase index 753e7c10..fda455d3 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 753e7c10619427f7f5b0ae89379717f9a163d546 +Subproject commit fda455d34de47bf8857f8bf128d93f33179706c8 -- cgit v1.2.3 From 91e7e78e632c13d9c9e4a935d85b783befd20082 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 30 Aug 2019 10:40:41 +0200 Subject: Update submodules on 'wip/cmake' in qt5 Change-Id: I30bfbcd5e25391613bc5c7219446d0bc336894cb Reviewed-by: Liang Qi --- qtbase | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtbase b/qtbase index fda455d3..8367a51c 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit fda455d34de47bf8857f8bf128d93f33179706c8 +Subproject commit 8367a51c6d8b63ae3195ec5d46d3a2aee6ea7222 -- cgit v1.2.3 From 4bf048f7a7fbec16eac8985a1cde5b2d5dfccc6a Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Fri, 30 Aug 2019 12:38:16 +0200 Subject: Include qtsvg in wip/cmake Change-Id: I6df7b31637e9512dc7fe92819741d01af3f87310 Reviewed-by: Alexandru Croitor --- .gitmodules | 4 ++-- qtsvg | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 89f0ec17..abd119d3 100644 --- a/.gitmodules +++ b/.gitmodules @@ -7,8 +7,8 @@ depends = qtbase path = qtsvg url = ../qtsvg.git - branch = dev - status = ignore + branch = wip/cmake + status = addon [submodule "qtdeclarative"] depends = qtbase recommends = qtsvg diff --git a/qtsvg b/qtsvg index 43a0fc84..e5b211a4 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 43a0fc8412b9da42d81a508fc5265510f2dfd175 +Subproject commit e5b211a4adc313cc10d1216ff3e8a166b562137b -- cgit v1.2.3 From 9ba0de370893c30d2f77710f91132c1a463c0506 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 30 Aug 2019 23:01:45 +0200 Subject: Update submodules on 'wip/cmake' in qt5 Change-Id: Iee3299d179b8dfcdc7b69dd683c4be685610605a Reviewed-by: Liang Qi --- qtbase | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtbase b/qtbase index 8367a51c..659d8cf3 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 8367a51c6d8b63ae3195ec5d46d3a2aee6ea7222 +Subproject commit 659d8cf3e5d906d41af6a36d95618de726a9b248 -- cgit v1.2.3 From 580d5fcc3205da0219b73fdeccbadda3c77e5d13 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 2 Sep 2019 15:23:33 +0200 Subject: Update submodules on 'wip/cmake' in qt5 Change-Id: Id663bfb78313de014c8412396321253a505f80c7 Reviewed-by: Liang Qi --- qtbase | 2 +- qtrepotools | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qtbase b/qtbase index 659d8cf3..f9842ae7 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 659d8cf3e5d906d41af6a36d95618de726a9b248 +Subproject commit f9842ae7d481cf5df08a000c4af7822d1bee0dd7 diff --git a/qtrepotools b/qtrepotools index 157ec79c..37df2fd6 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 157ec79c64c8aba721536a4f06f656a2af15d4d3 +Subproject commit 37df2fd634feac3458c19b8a37a44a36f8e3a72f -- cgit v1.2.3 From 34dd42b9f852e007f19620eaf4bd251b92420b1d Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 3 Sep 2019 11:27:18 +0200 Subject: Update submodules on 'wip/cmake' in qt5 Change-Id: I989dc05dc59095f47defb8cf4af20b40060ac2ab Reviewed-by: Liang Qi --- qtbase | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtbase b/qtbase index f9842ae7..0ef87537 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit f9842ae7d481cf5df08a000c4af7822d1bee0dd7 +Subproject commit 0ef87537742cce5a8e7a30a9ba9b923f0f4d2dc9 -- cgit v1.2.3 From 4259affdb7d46b5998426c5b2e1dc4bb50f5a871 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 3 Sep 2019 13:50:26 +0200 Subject: Update submodules on 'wip/cmake' in qt5 Change-Id: Ibf9eb43c66e2bb4d3c8e17d2ff99794408df9b9e Reviewed-by: Liang Qi --- qtbase | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtbase b/qtbase index 0ef87537..e0fbb730 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 0ef87537742cce5a8e7a30a9ba9b923f0f4d2dc9 +Subproject commit e0fbb7306d908fd5b3c6c34e7c041a067d8d5b9c -- cgit v1.2.3 From 9eefc9213e2dcb497bdc70c54a94d95a4dba0ec0 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 4 Sep 2019 15:19:00 +0200 Subject: Update submodules on 'wip/cmake' in qt5 Change-Id: Id515390a8b8af0d989609d44fcc1e4d113190bca Reviewed-by: Liang Qi --- qtbase | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtbase b/qtbase index e0fbb730..18fc9e1b 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit e0fbb7306d908fd5b3c6c34e7c041a067d8d5b9c +Subproject commit 18fc9e1bf821130f0cfe45dc7d5c05b70458e7c0 -- cgit v1.2.3 From bd8feeb6b2c63d861c97efedad557572fbeaabb1 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Wed, 4 Sep 2019 15:56:40 +0200 Subject: Update qtbase manually Hopefully this pulls in the last fixes to make declarative work. Change-Id: I7c4765be631b917ee51e200977a01a913bc619b2 Reviewed-by: Alexandru Croitor --- qtbase | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtbase b/qtbase index 18fc9e1b..4ee762cf 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 18fc9e1bf821130f0cfe45dc7d5c05b70458e7c0 +Subproject commit 4ee762cf25e4aa0801297d1a8152ecbb598a02b5 -- cgit v1.2.3 From 651b050e139b316c5fd7f777a92b5095193d0617 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Wed, 4 Sep 2019 19:30:14 +0200 Subject: Include qtdeclarative in wip/cmake Change-Id: I9d23a60fbd88e30ee688532dbe5112dd3245b9a7 Reviewed-by: Simon Hausmann --- .gitmodules | 4 ++-- qtdeclarative | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index abd119d3..2f53378e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -14,8 +14,8 @@ recommends = qtsvg path = qtdeclarative url = ../qtdeclarative.git - branch = dev - status = ignore + branch = wip/cmake + status = essential [submodule "qtactiveqt"] depends = qtbase path = qtactiveqt diff --git a/qtdeclarative b/qtdeclarative index 00bcc365..6536c67b 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 00bcc365403f253e0c6fd54b7b1715ba974679c5 +Subproject commit 6536c67b53db275bb51d61de3d896893101d278a -- cgit v1.2.3 From 30d78feb0cf7ba96bf29e5b7f89bf6baf4965765 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Thu, 5 Sep 2019 09:43:29 +0200 Subject: Include qtgraphicaleffects in wip/cmake Change-Id: Ie8fd5d478caa1d16cdea3c06a9b7cfeeb7dcd0cc Reviewed-by: Simon Hausmann --- .gitmodules | 4 ++-- qtgraphicaleffects | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 2f53378e..2efd083d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -149,8 +149,8 @@ depends = qtdeclarative path = qtgraphicaleffects url = ../qtgraphicaleffects.git - branch = dev - status = ignore + branch = wip/cmake + status = addon [submodule "qtquickcontrols"] depends = qtdeclarative recommends = qtgraphicaleffects diff --git a/qtgraphicaleffects b/qtgraphicaleffects index dbddc986..813ac231 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit dbddc98658a8d1dc407ff0eb7d40558e99d831c7 +Subproject commit 813ac231387a48142f8645486d639152b0501194 -- cgit v1.2.3 From 5bd6aa7c26be9af9ed1940c3567e25b14f914bb0 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Thu, 5 Sep 2019 13:51:17 +0200 Subject: Include qtimageformats and qtnetworkauth in wip/cmake Change-Id: I9f451ef08663a635ca05427735a31da895a68607 Reviewed-by: Simon Hausmann --- .gitmodules | 8 ++++---- qtimageformats | 2 +- qtnetworkauth | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitmodules b/.gitmodules index 2efd083d..640f73ff 100644 --- a/.gitmodules +++ b/.gitmodules @@ -143,8 +143,8 @@ depends = qtbase path = qtimageformats url = ../qtimageformats.git - branch = dev - status = ignore + branch = wip/cmake + status = addon [submodule "qtgraphicaleffects"] depends = qtdeclarative path = qtgraphicaleffects @@ -290,8 +290,8 @@ depends = qtbase path = qtnetworkauth url = ../qtnetworkauth.git - branch = dev - status = ignore + branch = wip/cmake + status = addon [submodule "qtremoteobjects"] depends = qtbase recommends = qtdeclarative diff --git a/qtimageformats b/qtimageformats index 147cd191..9cf98b08 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 147cd191d68a248f257317f5403fe0b3b9d6cbf2 +Subproject commit 9cf98b08da79980017b1663f3603149f39a21513 diff --git a/qtnetworkauth b/qtnetworkauth index 3e927d64..94cbd067 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 3e927d64266aa51d1f4f853f3c905ffd4576b6bc +Subproject commit 94cbd067349e315e8d1f8798228ade0b77a65b79 -- cgit v1.2.3 From a30c79bcfb2f0105386799b3845e35ffcf7e79e0 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 5 Sep 2019 13:57:21 +0200 Subject: Update submodules on 'wip/cmake' in qt5 Change-Id: I90667c3b7b1920d129cc8821059a56a9d9f70766 Reviewed-by: Liang Qi --- qtbase | 2 +- qtimageformats | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qtbase b/qtbase index 4ee762cf..b2a11daa 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 4ee762cf25e4aa0801297d1a8152ecbb598a02b5 +Subproject commit b2a11daaa177805d36e33ca57e94093919107269 diff --git a/qtimageformats b/qtimageformats index 9cf98b08..1d4a58a8 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 9cf98b08da79980017b1663f3603149f39a21513 +Subproject commit 1d4a58a877b8b28074ca84a07340d2d8604b38d6 -- cgit v1.2.3 From 2b42c7d383b2754d172f7bf3a87d5dc3c64bc6a2 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Thu, 5 Sep 2019 15:37:45 +0200 Subject: Update qtbase manually to pull in build fix for qttools Change-Id: I223b8c2f10bc05a5eacd103b65a061365e58ab46 Reviewed-by: Simon Hausmann --- qtbase | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtbase b/qtbase index b2a11daa..bc54f0b1 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit b2a11daaa177805d36e33ca57e94093919107269 +Subproject commit bc54f0b16481ec7e6767928c2ae7e79f904440d0 -- cgit v1.2.3 From e4259942ff41fe6fd8e4048e264bd946f3692e5e Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Thu, 5 Sep 2019 15:56:23 +0200 Subject: Add empty build instructions to allow for qt5 integrations The build shall be empty for now, but this allow testing module wide updates. Change-Id: I47bcdae274edb2ec000bb57480d74614d3b55833 Reviewed-by: Alexandru Croitor --- coin/module_config.yaml | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 coin/module_config.yaml diff --git a/coin/module_config.yaml b/coin/module_config.yaml new file mode 100644 index 00000000..d10eb769 --- /dev/null +++ b/coin/module_config.yaml @@ -0,0 +1,10 @@ +version: 1 +accept_configuration: + condition: property + property: host.os + equals_property: target.os + +build_instructions: + - type: EnvironmentVariable + variableName: Dummy + variableValue: dummy -- cgit v1.2.3 From f99d5e8b78c7a7eb96673db3942015681c8a4fa4 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Fri, 6 Sep 2019 11:02:01 +0200 Subject: Re-enable qttools for use with cmake Change-Id: I040b8769af22290a986ccac476f30e7eed78b3e4 Reviewed-by: Liang Qi --- .gitmodules | 4 ++-- qttools | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 640f73ff..3c8b4eb6 100644 --- a/.gitmodules +++ b/.gitmodules @@ -27,8 +27,8 @@ recommends = qttools path = qtscript url = ../qtscript.git - branch = dev - status = ignore + branch = wip/cmake + status = essential [submodule "qtmultimedia"] depends = qtbase recommends = qtdeclarative diff --git a/qttools b/qttools index 7e355162..7292c4ed 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 7e355162ca7566df29045d4fa25fed74c97f3bae +Subproject commit 7292c4ed1076c252a30d16557585ceb8fac2248b -- cgit v1.2.3 From 01b083ca8e098001b5808a56a409bf37edb49036 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Fri, 6 Sep 2019 11:22:19 +0200 Subject: Disable qtscript for the cmake build The module has not been ported. Change-Id: I99041e00fb30b2a9799ee3e948f255422bbc6976 Reviewed-by: Alexandru Croitor --- .gitmodules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 3c8b4eb6..640f73ff 100644 --- a/.gitmodules +++ b/.gitmodules @@ -27,8 +27,8 @@ recommends = qttools path = qtscript url = ../qtscript.git - branch = wip/cmake - status = essential + branch = dev + status = ignore [submodule "qtmultimedia"] depends = qtbase recommends = qtdeclarative -- cgit v1.2.3 From 016016b64ead5882cb39e23d99832344083f5cf7 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Fri, 6 Sep 2019 15:30:46 +0200 Subject: Really add qttools to the build ... and not qtscript accidentally, like in the previous change. Change-Id: Ic8cd85ef7b149ffee7bc85ffa3fc9075f8a77c1b Reviewed-by: Simon Hausmann --- .gitmodules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 640f73ff..7f30091a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -41,8 +41,8 @@ recommends = qtdeclarative qtactiveqt path = qttools url = ../qttools.git - branch = dev - status = ignore + branch = wip/cmake + status = essential [submodule "qtxmlpatterns"] depends = qtbase recommends = qtdeclarative -- cgit v1.2.3 From 8b7c454d35c89e6976f0bbb8dd0adeb4555b79b0 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Fri, 6 Sep 2019 15:52:20 +0200 Subject: Update submodules on 'wip/cmake' in qt/qt5 Change-Id: I9ab957cbe9f81f266ec590e9fb8100608f77f55d Reviewed-by: Simon Hausmann Reviewed-by: Qt CMake Build Bot --- qtbase | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtbase b/qtbase index bc54f0b1..b28c2c95 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit bc54f0b16481ec7e6767928c2ae7e79f904440d0 +Subproject commit b28c2c952850e80cc399dbba8a627a96789ffec9 -- cgit v1.2.3 From bd4774f6906cc0092367bf30c3f743a0eccf35cf Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 6 Sep 2019 23:01:26 +0200 Subject: Update submodules on 'wip/cmake' in qt5 Change-Id: I72c047067aee2006aedfb97fa8d7e3fc214ee590 Reviewed-by: Qt CMake Build Bot Reviewed-by: Liang Qi --- qtbase | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtbase b/qtbase index b28c2c95..bf899ba5 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit b28c2c952850e80cc399dbba8a627a96789ffec9 +Subproject commit bf899ba53b0407f5ef88bddb15115d4f8f03c345 -- cgit v1.2.3 From 8e6a3321dfb3b7ec883d222543c3216ce1edb175 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 9 Sep 2019 21:32:58 +0200 Subject: Update submodules on 'wip/cmake' in qt5 Change-Id: Iac966615b9f25dc4be021d1db59f8c933646231d Reviewed-by: Liang Qi --- qtbase | 2 +- qtnetworkauth | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qtbase b/qtbase index bf899ba5..b0dbfc30 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit bf899ba53b0407f5ef88bddb15115d4f8f03c345 +Subproject commit b0dbfc3094b9c3950643fc5acf7020e33825dd3e diff --git a/qtnetworkauth b/qtnetworkauth index 94cbd067..316db244 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 94cbd067349e315e8d1f8798228ade0b77a65b79 +Subproject commit 316db244bd6eccd53b8857c1a260f1c7646095a6 -- cgit v1.2.3 From c62fcdea06aa53b6582b6ab0423704cfa6f728e9 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 10 Sep 2019 16:24:05 +0200 Subject: Update submodules on 'wip/cmake' in qt5 Change-Id: I37d9b32566af41419e1bb64c0cf94c66fb3e6c4f Reviewed-by: Liang Qi --- qtbase | 2 +- qtdeclarative | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qtbase b/qtbase index b0dbfc30..7df0868a 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit b0dbfc3094b9c3950643fc5acf7020e33825dd3e +Subproject commit 7df0868ad59dd071f2ce2dd355488128fa56f645 diff --git a/qtdeclarative b/qtdeclarative index 6536c67b..b1299f6a 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 6536c67b53db275bb51d61de3d896893101d278a +Subproject commit b1299f6a83d2a2c6aaf8b28b8cf774a1e881aa49 -- cgit v1.2.3 From 677412dcbebe0baa535912f090d5a5b8a4c94273 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Mon, 9 Sep 2019 11:22:33 +0200 Subject: Move the developer build from static suse to ubuntu Because we don't run tests on static build. Change-Id: I10c7851ecebcfa3691690c6bc26a352fd5799965 Reviewed-by: Qt CMake Build Bot Reviewed-by: Simon Hausmann --- coin/platform_configs/default.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml index 667b081f..4bceae07 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -1,9 +1,9 @@ - Template: 'qtci-linux-Ubuntu-18.04-x86_64' Compiler: 'GCC' - Configure arguments: '-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DBUILD_EXAMPLES=OFF' + Configure arguments: '-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DBUILD_EXAMPLES=OFF -DFEATURE_developer_build=ON' - Template: 'qtci-linux-openSUSE-15.0-x86_64' Compiler: 'ICC_18' - Configure arguments: '-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DBUILD_EXAMPLES=OFF -DFEATURE_developer_build=ON -DBUILD_SHARED_LIBS=OFF' + Configure arguments: '-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DBUILD_EXAMPLES=OFF -DBUILD_SHARED_LIBS=OFF' - Template: 'qtci-macos-10.13-x86_64-2' Compiler: 'Clang' Configure arguments: '-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DBUILD_EXAMPLES=OFF -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode10.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.14.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.12' -- cgit v1.2.3 From d6969029040b9b938f6376bc043861a493a533d7 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 13 Sep 2019 13:22:18 +0200 Subject: Update submodules on 'wip/cmake' in qt/qt5 Change-Id: I210881714fd91a65d8016198c9b23c382d69494c Reviewed-by: Qt CMake Build Bot Reviewed-by: Liang Qi --- qtbase | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtbase b/qtbase index 7df0868a..5884f793 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 7df0868ad59dd071f2ce2dd355488128fa56f645 +Subproject commit 5884f793b9248d95a923a33663aa26386a6c4bbd -- cgit v1.2.3 From 5df688ef3aa855da2865c8b27a0aaea3ed542700 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 13 Sep 2019 23:01:15 +0200 Subject: Update submodules on 'wip/cmake' in qt/qt5 Change-Id: I4464812c569599cad5d6d4a2b2cce0c628799b81 Reviewed-by: Qt CMake Build Bot Reviewed-by: Liang Qi --- qttools | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qttools b/qttools index 7292c4ed..342f402c 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 7292c4ed1076c252a30d16557585ceb8fac2248b +Subproject commit 342f402c002f1bfcc842dd7711b040de4e2b27e7 -- cgit v1.2.3 From afa801cd31c26a475d0d07aaa4f27da767b0c709 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Mon, 16 Sep 2019 17:10:26 +0200 Subject: Re-add QtWebSockets Maurice ported the module and we can add it to the Qt5 set now. Change-Id: I146e60f6f18dcf7a00775e532e715e3718644edc Reviewed-by: Alexandru Croitor --- .gitmodules | 4 ++-- qtwebsockets | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 7f30091a..e103e853 100644 --- a/.gitmodules +++ b/.gitmodules @@ -201,8 +201,8 @@ recommends = qtdeclarative path = qtwebsockets url = ../qtwebsockets.git - branch = dev - status = ignore + branch = wip/cmake + status = addon [submodule "qtwebchannel"] depends = qtbase recommends = qtdeclarative qtwebsockets diff --git a/qtwebsockets b/qtwebsockets index d1a9b0db..a3c87a0e 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit d1a9b0db6b1f7fd048c6388e96b08799a7bf62ca +Subproject commit a3c87a0e44bb67cc3f726dd915178f9f307480e8 -- cgit v1.2.3 From 5560b7eced65a83288263ddd06d8d9e2cb6805df Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 18 Sep 2019 23:01:31 +0200 Subject: Update submodules on 'wip/cmake' in qt/qt5 Change-Id: Ie983c915a2cc472c87b02934700a7219c2b0b359 Reviewed-by: Qt CMake Build Bot Reviewed-by: Simon Hausmann --- qtbase | 2 +- qtdeclarative | 2 +- qtgraphicaleffects | 2 +- qtnetworkauth | 2 +- qtwebsockets | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/qtbase b/qtbase index 5884f793..d03d12a7 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 5884f793b9248d95a923a33663aa26386a6c4bbd +Subproject commit d03d12a74f08973b272266810ee37514aaecbacc diff --git a/qtdeclarative b/qtdeclarative index b1299f6a..ec571969 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit b1299f6a83d2a2c6aaf8b28b8cf774a1e881aa49 +Subproject commit ec57196980e6a32fce3c56ec3c9f8183c7bcaad1 diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 813ac231..93d9b1e8 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 813ac231387a48142f8645486d639152b0501194 +Subproject commit 93d9b1e891666137f475223d1855d202f97045b1 diff --git a/qtnetworkauth b/qtnetworkauth index 316db244..e31ed2ab 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 316db244bd6eccd53b8857c1a260f1c7646095a6 +Subproject commit e31ed2abc236f0c92ede9e1dd5ad6ecd53cc26f4 diff --git a/qtwebsockets b/qtwebsockets index a3c87a0e..5feeb586 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit a3c87a0e44bb67cc3f726dd915178f9f307480e8 +Subproject commit 5feeb5867d032cc4641ee088cfa5bd9063bcf5cd -- cgit v1.2.3 From 5c1656826bce042866d08c4e86a62335dec07a24 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Thu, 19 Sep 2019 16:00:10 +0200 Subject: Add qtserialport to qt5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The module has received its initial port Change-Id: Ie5814be1f52965cb2393ec331e12751472890abc Reviewed-by: Mårten Nordheim Reviewed-by: Qt CMake Build Bot --- .gitmodules | 4 ++-- qtserialport | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index e103e853..eaecbd44 100644 --- a/.gitmodules +++ b/.gitmodules @@ -169,8 +169,8 @@ depends = qtbase path = qtserialport url = ../qtserialport.git - branch = dev - status = ignore + branch = wip/cmake + status = addon [submodule "qtx11extras"] depends = qtbase path = qtx11extras diff --git a/qtserialport b/qtserialport index 0da18e91..09392f99 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 0da18e91f44ac916540450a33d5c64b59d347934 +Subproject commit 09392f99b62dd6c7d4d3b848b18719af60c315c1 -- cgit v1.2.3 From 48d218a86fb84c0303dd7fdef9cc115a7d0ab338 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 19 Sep 2019 23:01:17 +0200 Subject: Update submodules on 'wip/cmake' in qt/qt5 Change-Id: Ie505de6df9bf42d96f4dec88ecedb1347f74f401 Reviewed-by: Qt CMake Build Bot Reviewed-by: Liang Qi --- qtbase | 2 +- qtdeclarative | 2 +- qtrepotools | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/qtbase b/qtbase index d03d12a7..25c53ce0 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit d03d12a74f08973b272266810ee37514aaecbacc +Subproject commit 25c53ce00ed1e4ea777d1b34552443b5e090a859 diff --git a/qtdeclarative b/qtdeclarative index ec571969..42dbc4a6 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit ec57196980e6a32fce3c56ec3c9f8183c7bcaad1 +Subproject commit 42dbc4a64b9debcd1af8575fb49d13a498ffcf0e diff --git a/qtrepotools b/qtrepotools index 37df2fd6..3b937032 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 37df2fd634feac3458c19b8a37a44a36f8e3a72f +Subproject commit 3b937032f51c75b3f517e02b1db670884a8dc103 -- cgit v1.2.3 From b2fe8b2f09ee63d79350ea9c0f2062c85ea2bc3f Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 20 Sep 2019 23:01:45 +0200 Subject: Update submodules on 'wip/cmake' in qt/qt5 Change-Id: If30c3b1b176d07ad273205f3f7b9a9fa30cae4f6 Reviewed-by: Qt CMake Build Bot Reviewed-by: Liang Qi --- qtbase | 2 +- qtdeclarative | 2 +- qtserialport | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/qtbase b/qtbase index 25c53ce0..f771b8f6 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 25c53ce00ed1e4ea777d1b34552443b5e090a859 +Subproject commit f771b8f6b14418508c110e1e0dcd31b903424fca diff --git a/qtdeclarative b/qtdeclarative index 42dbc4a6..bf58a1cc 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 42dbc4a64b9debcd1af8575fb49d13a498ffcf0e +Subproject commit bf58a1cc043c72c6df97b4c00ce7f90c83237f69 diff --git a/qtserialport b/qtserialport index 09392f99..2e27d196 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 09392f99b62dd6c7d4d3b848b18719af60c315c1 +Subproject commit 2e27d1967a9a4146697028ed8feed14d0df2a46a -- cgit v1.2.3 From 709e687c84c67ba8faf2411c081b29f25d76de4e Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 21 Sep 2019 23:01:31 +0200 Subject: Update submodules on 'wip/cmake' in qt/qt5 Change-Id: I3a5377e9b1f3365596e25985504342a041371886 Reviewed-by: Qt CMake Build Bot Reviewed-by: Liang Qi --- qtbase | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtbase b/qtbase index f771b8f6..900df481 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit f771b8f6b14418508c110e1e0dcd31b903424fca +Subproject commit 900df4812278f8c9cde915690a2be355307f09dd -- cgit v1.2.3 From 00bafec76827d40456cb31cdf7a46fbbed3331cf Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 23 Sep 2019 08:06:08 +0200 Subject: Update submodules on 'wip/cmake' in qt/qt5 Change-Id: I8f67a3299fc118d337141ad680507015e41e31d4 Reviewed-by: Qt CMake Build Bot Reviewed-by: Liang Qi --- qtbase | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtbase b/qtbase index 900df481..80d86fed 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 900df4812278f8c9cde915690a2be355307f09dd +Subproject commit 80d86fed13c5a59691d26a711ffa9bfdd994f27c -- cgit v1.2.3 From 9bc8a3e458c9fc5340ce57053501729d868d1dd8 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 23 Sep 2019 23:01:35 +0200 Subject: Update submodules on 'wip/cmake' in qt/qt5 Change-Id: Iff018927681934d6bf06271d5a2d3ad8008bbcc3 Reviewed-by: Qt CMake Build Bot Reviewed-by: Liang Qi --- qtbase | 2 +- qtdeclarative | 2 +- qtrepotools | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/qtbase b/qtbase index 80d86fed..8049ef3d 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 80d86fed13c5a59691d26a711ffa9bfdd994f27c +Subproject commit 8049ef3d4d1e6c458211a3c86ea35e9fe9b29ff5 diff --git a/qtdeclarative b/qtdeclarative index bf58a1cc..2ccd7b93 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit bf58a1cc043c72c6df97b4c00ce7f90c83237f69 +Subproject commit 2ccd7b931f3bc392f1f3579a2867912b84835ab4 diff --git a/qtrepotools b/qtrepotools index 3b937032..a51db43b 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 3b937032f51c75b3f517e02b1db670884a8dc103 +Subproject commit a51db43b580f774c64275cd3e1e0c707de2a04a4 -- cgit v1.2.3 From 29376716fdb61c5be151c32c9057e56ffdf0642b Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 24 Sep 2019 23:01:29 +0200 Subject: Update submodules on 'wip/cmake' in qt/qt5 Change-Id: Ib983c826d9a62d0ca506fb238c4e08981729a211 Reviewed-by: Qt CMake Build Bot Reviewed-by: Simon Hausmann --- qtbase | 2 +- qtdeclarative | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qtbase b/qtbase index 8049ef3d..4b592ba9 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 8049ef3d4d1e6c458211a3c86ea35e9fe9b29ff5 +Subproject commit 4b592ba90c4a9da3bd5707e70c9d0e25891bda25 diff --git a/qtdeclarative b/qtdeclarative index 2ccd7b93..662c5ec3 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 2ccd7b931f3bc392f1f3579a2867912b84835ab4 +Subproject commit 662c5ec31d7c1670af3ce885cd2dab7ffa2dc613 -- cgit v1.2.3 From 1605059e87b9954ca9bc4f0786b06dfeb2058e73 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Wed, 25 Sep 2019 10:34:59 +0200 Subject: platform_configs: remove CMAKE_VERBOSE_MAKEFILE option which is not in use when ninja got selected. Change-Id: I1841471dee0f58e4a54cd05f33f4ba7c3a1a8251 Reviewed-by: Qt CMake Build Bot Reviewed-by: Alexandru Croitor --- coin/platform_configs/default.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml index 4bceae07..a2499e16 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -1,12 +1,12 @@ - Template: 'qtci-linux-Ubuntu-18.04-x86_64' Compiler: 'GCC' - Configure arguments: '-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DBUILD_EXAMPLES=OFF -DFEATURE_developer_build=ON' + Configure arguments: '-DBUILD_EXAMPLES=OFF -DFEATURE_developer_build=ON' - Template: 'qtci-linux-openSUSE-15.0-x86_64' Compiler: 'ICC_18' - Configure arguments: '-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DBUILD_EXAMPLES=OFF -DBUILD_SHARED_LIBS=OFF' + Configure arguments: '-DBUILD_EXAMPLES=OFF -DBUILD_SHARED_LIBS=OFF' - Template: 'qtci-macos-10.13-x86_64-2' Compiler: 'Clang' - Configure arguments: '-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DBUILD_EXAMPLES=OFF -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode10.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.14.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.12' + Configure arguments: '-DBUILD_EXAMPLES=OFF -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode10.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.14.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.12' - Template: 'qtci-windows-10-x86_64-14' Compiler: 'MSVC2017' - Configure arguments: '-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DBUILD_EXAMPLES=OFF -DCMAKE_TOOLCHAIN_FILE={{.Env.VCPKG_ROOT}}/scripts/buildsystems/vcpkg.cmake' + Configure arguments: '-DBUILD_EXAMPLES=OFF -DCMAKE_TOOLCHAIN_FILE={{.Env.VCPKG_ROOT}}/scripts/buildsystems/vcpkg.cmake' -- cgit v1.2.3 From a21de5f32a91c1661c33bddb421e914a96dcda48 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 25 Sep 2019 14:10:28 +0200 Subject: Update submodules on 'wip/cmake' in qt/qt5 Change-Id: I10025657bc7887680bfc442be6d1ce5f4dc920f8 Reviewed-by: Qt CMake Build Bot Reviewed-by: Liang Qi --- qtbase | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtbase b/qtbase index 4b592ba9..724281d1 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 4b592ba90c4a9da3bd5707e70c9d0e25891bda25 +Subproject commit 724281d1aa4588fd37d38d650b608cec3379e185 -- cgit v1.2.3 From 5c79b8cf5242b8b2d904f77de494f08dc25f519d Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 26 Sep 2019 08:11:44 +0200 Subject: Update submodules on 'wip/cmake' in qt/qt5 Change-Id: I4ceab395f4a906627970b67486ac6f91842873af Reviewed-by: Qt CMake Build Bot Reviewed-by: Liang Qi --- qtbase | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtbase b/qtbase index 724281d1..8b1e6c2e 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 724281d1aa4588fd37d38d650b608cec3379e185 +Subproject commit 8b1e6c2e1509eb15e4c45b2ca6de62883a51d6ee -- cgit v1.2.3 From bc77f3ca14a90f12c40a5e6b3e99583c2d590b66 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 26 Sep 2019 23:01:30 +0200 Subject: Update submodules on 'wip/cmake' in qt/qt5 Change-Id: Idee08dbe60f6abae4495f31b66a74702788f809f Reviewed-by: Qt CMake Build Bot Reviewed-by: Liang Qi --- qtbase | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtbase b/qtbase index 8b1e6c2e..992fe06b 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 8b1e6c2e1509eb15e4c45b2ca6de62883a51d6ee +Subproject commit 992fe06b30337442b96e5f8b6553e518fedcd372 -- cgit v1.2.3 From cc733ed0cad2c2922be5c9f7c4f8bfbed41d4792 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 27 Sep 2019 12:49:44 +0200 Subject: Update submodules on 'wip/cmake' in qt/qt5 Change-Id: Ie4ae842e78078a4779e22f68889a211d1980411a Reviewed-by: Alexandru Croitor Reviewed-by: Qt CMake Build Bot --- qtbase | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtbase b/qtbase index 992fe06b..6f5b1dd9 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 992fe06b30337442b96e5f8b6553e518fedcd372 +Subproject commit 6f5b1dd9ab257542c9f1d0be324968a487e9a77b -- cgit v1.2.3 From c97967de9899b7dac0bcd02d63c12afe5f866f21 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 27 Sep 2019 16:47:45 +0200 Subject: Update submodules on 'wip/cmake' in qt/qt5 Change-Id: Ib89a5977eef689938a8e3ac12141204b733aa79d Reviewed-by: Qt CMake Build Bot Reviewed-by: Liang Qi --- qtbase | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtbase b/qtbase index 6f5b1dd9..1daaaf74 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 6f5b1dd9ab257542c9f1d0be324968a487e9a77b +Subproject commit 1daaaf74a63a09702b65676ba18f559d3c6ebc83 -- cgit v1.2.3 From cba04eb53199c6f7672e4dc94b3ab1765c6c517b Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Fri, 26 Jul 2019 19:09:29 +0200 Subject: Build examples on at least one configuration Ubuntu Linux in this case. Change-Id: Ic17b3f4880105e639340ffc07c52de27245612d7 Reviewed-by: Qt CMake Build Bot Reviewed-by: Simon Hausmann --- coin/platform_configs/default.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml index a2499e16..dab36910 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -1,6 +1,6 @@ - Template: 'qtci-linux-Ubuntu-18.04-x86_64' Compiler: 'GCC' - Configure arguments: '-DBUILD_EXAMPLES=OFF -DFEATURE_developer_build=ON' + Configure arguments: '-DBUILD_EXAMPLES=ON -DFEATURE_developer_build=ON' - Template: 'qtci-linux-openSUSE-15.0-x86_64' Compiler: 'ICC_18' Configure arguments: '-DBUILD_EXAMPLES=OFF -DBUILD_SHARED_LIBS=OFF' -- cgit v1.2.3 From b5ae486a0d01a8065739920684a0501bd75448fa Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 30 Sep 2019 23:01:37 +0200 Subject: Update submodules on 'wip/cmake' in qt/qt5 Change-Id: Iaf43abe04e52a56cb5a3d1f7d62868c5b5f009d1 Reviewed-by: Qt CMake Build Bot Reviewed-by: Liang Qi --- qtbase | 2 +- qtdeclarative | 2 +- qtnetworkauth | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/qtbase b/qtbase index 1daaaf74..0e14bd58 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 1daaaf74a63a09702b65676ba18f559d3c6ebc83 +Subproject commit 0e14bd586a6e04da3f7c16f98b2392d56a5539d8 diff --git a/qtdeclarative b/qtdeclarative index 662c5ec3..c10edb1d 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 662c5ec31d7c1670af3ce885cd2dab7ffa2dc613 +Subproject commit c10edb1deb68686620b28c104f8e8355a1838166 diff --git a/qtnetworkauth b/qtnetworkauth index e31ed2ab..cd5e9aa3 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit e31ed2abc236f0c92ede9e1dd5ad6ecd53cc26f4 +Subproject commit cd5e9aa39f192f8265064e59e7771241f81a5f9c -- cgit v1.2.3 From 8e0249218fa2b02d2d7d663cfe2f881ed54b0d11 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 1 Oct 2019 16:25:10 +0200 Subject: Update submodules on 'wip/cmake' in qt/qt5 Change-Id: Ifcd9682f77549feada64323c6b7ee668962cbf2c Reviewed-by: Qt CMake Build Bot Reviewed-by: Liang Qi --- qtbase | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtbase b/qtbase index 0e14bd58..1b0710a3 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 0e14bd586a6e04da3f7c16f98b2392d56a5539d8 +Subproject commit 1b0710a39380c7f75bba2d777e137f247fcbd5b7 -- cgit v1.2.3 From bd3b4ef1706a5bf7a723ddee65adef04edfb2628 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Wed, 2 Oct 2019 15:15:19 +0200 Subject: Add qtgamepad and qtscxml to qt5 Change-Id: I7267704b048aae8cdd634d47c7ae4040272298ea Reviewed-by: Alexandru Croitor Reviewed-by: Qt CMake Build Bot --- .gitmodules | 8 ++++---- qtgamepad | 2 +- qtscxml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitmodules b/.gitmodules index 4c618445..10b9bd3d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -271,14 +271,14 @@ recommends = qtdeclarative path = qtgamepad url = ../qtgamepad.git - branch = dev - status = ignore + branch = wip/cmake + status = addon [submodule "qtscxml"] depends = qtbase qtdeclarative path = qtscxml url = ../qtscxml.git - branch = dev - status = ignore + branch = wip/cmake + status = addon [submodule "qtspeech"] depends = qtbase recommends = qtdeclarative qtmultimedia diff --git a/qtgamepad b/qtgamepad index 2ff613b5..28113e0f 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit 2ff613b5971d687d8d92e6baad3466ee2af5c434 +Subproject commit 28113e0f22fb62d02abf8b75910f7357be7bf1fc diff --git a/qtscxml b/qtscxml index f149bb9d..5fe75751 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit f149bb9d9afbe7a3d81741e95a121b78be25bbdf +Subproject commit 5fe75751ed90354eb0968f528974592003c65460 -- cgit v1.2.3 From 1478b607d6b32d63297927bdd5d47fccc29038cb Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Wed, 2 Oct 2019 10:00:48 +0200 Subject: Provisioning: install libsdl2 on ubuntu MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I3c547c1e44ebc734fd9908db2828440bc13f55f5 Reviewed-by: Qt CMake Build Bot Reviewed-by: Mårten Nordheim Reviewed-by: Alexandru Croitor --- coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh index bfb58a2c..ee121e92 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh @@ -169,6 +169,9 @@ installPackages+=(texinfo) # Needed for QtCore installPackages+=(libdouble-conversion-dev) installPackages+=(libpcre2-dev) +# Needed for qtgampepad +installPackages+=(libsdl2-2.0) +installPackages+=(libsdl2-dev) echo "Running update for apt" waitLoop -- cgit v1.2.3 From 65dcf13a108787a017c25471d25510387c912ecd Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 3 Oct 2019 11:15:11 +0200 Subject: Update submodules on 'wip/cmake' in qt/qt5 Change-Id: I402e989617238940b5c11b4eac1b76f37e89536f Reviewed-by: Qt CMake Build Bot Reviewed-by: Liang Qi --- qtgamepad | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtgamepad b/qtgamepad index 28113e0f..938e499f 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit 28113e0f22fb62d02abf8b75910f7357be7bf1fc +Subproject commit 938e499f724edf8b86c27a6800f0800d10ceacc6 -- cgit v1.2.3 From c79a9570da84bd1711d9f2935251217421e5d048 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 3 Oct 2019 23:01:32 +0200 Subject: Update submodules on 'wip/cmake' in qt/qt5 Change-Id: Id1a1a1a7ab7f8280221fa824ddb775691444c3d8 Reviewed-by: Qt CMake Build Bot Reviewed-by: Liang Qi --- qtbase | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtbase b/qtbase index 1b0710a3..e1beabc3 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 1b0710a39380c7f75bba2d777e137f247fcbd5b7 +Subproject commit e1beabc3b87ee202fa90af906be0cfeb2ffc2464 -- cgit v1.2.3 From c69c92ba3787e099244e3b80035d27a9bb972032 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 5 Oct 2019 23:01:31 +0200 Subject: Update submodules on 'wip/cmake' in qt/qt5 Change-Id: Ib9ca071946f1fa578543802707388cf67f1a842b Reviewed-by: Qt CMake Build Bot Reviewed-by: Liang Qi --- qtbase | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtbase b/qtbase index e1beabc3..a5946296 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit e1beabc3b87ee202fa90af906be0cfeb2ffc2464 +Subproject commit a5946296022cf6dc26f5f83997b5c1e3f7ef5748 -- cgit v1.2.3 From 91a1add070ceec18b24fb2c0c93b04cb8ef423be Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 7 Oct 2019 23:01:31 +0200 Subject: Update submodules on 'wip/cmake' in qt/qt5 Change-Id: I1a4c4dbd484521019d7c31b524110e24402ac96c Reviewed-by: Qt CMake Build Bot Reviewed-by: Liang Qi --- qtbase | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtbase b/qtbase index a5946296..1569c6d8 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit a5946296022cf6dc26f5f83997b5c1e3f7ef5748 +Subproject commit 1569c6d85e72558c6fbc0a6f90eedfab14139dd2 -- cgit v1.2.3 From 714686610e7183e1e1e67687305c7eaa87dbc1d9 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 8 Oct 2019 11:19:56 +0200 Subject: Update submodules on 'wip/cmake' in qt/qt5 Change-Id: Ia7dadd5ba374c17a9de0a0a0fe5cf71349b2dcf6 Reviewed-by: Qt CMake Build Bot Reviewed-by: Liang Qi --- qtbase | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtbase b/qtbase index 1569c6d8..d56e6274 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 1569c6d85e72558c6fbc0a6f90eedfab14139dd2 +Subproject commit d56e627427b9707caa64e10d1214b0adacbc970b -- cgit v1.2.3 From 660a81fedaa47b33354d2f9c3523410cbd63309a Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 8 Oct 2019 15:14:50 +0200 Subject: Update submodules on 'wip/cmake' in qt/qt5 Change-Id: I243f87e1f922a604ac473a22c38a2fcb97bed583 Reviewed-by: Qt CMake Build Bot Reviewed-by: Liang Qi --- qtbase | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtbase b/qtbase index d56e6274..319f8112 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit d56e627427b9707caa64e10d1214b0adacbc970b +Subproject commit 319f81126bca183d99ee261cdec85fc0ab9c9078 -- cgit v1.2.3 From beb62ece41827ee8a554dc144f24f37296ebe21a Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 8 Oct 2019 23:01:31 +0200 Subject: Update submodules on 'wip/cmake' in qt/qt5 Change-Id: I9b900f788ada06c5aa163464b467d41bdc4f9a4e Reviewed-by: Qt CMake Build Bot Reviewed-by: Liang Qi --- qtbase | 2 +- qtdeclarative | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qtbase b/qtbase index 319f8112..b7adc856 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 319f81126bca183d99ee261cdec85fc0ab9c9078 +Subproject commit b7adc85642584be26a1870617a9aa83c16e40cfb diff --git a/qtdeclarative b/qtdeclarative index c10edb1d..5f07a0e1 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit c10edb1deb68686620b28c104f8e8355a1838166 +Subproject commit 5f07a0e1149ed3df41f3ff5ef55f3f8bbad99909 -- cgit v1.2.3 From 6df365e0b255750d4d1886110a137030ec3c6e15 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Wed, 9 Oct 2019 10:11:34 +0200 Subject: Add qtserialbus to qt5 Change-Id: Ie3ad2a734b1f7ba341a93ff7f3cd96fee56c62c6 Reviewed-by: Alex Blasche Reviewed-by: Qt CMake Build Bot --- .gitmodules | 4 ++-- qtserialbus | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 10b9bd3d..9167958c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -163,8 +163,8 @@ recommends = qtserialport path = qtserialbus url = ../qtserialbus.git - branch = dev - status = ignore + branch = wip/cmake + status = addon [submodule "qtserialport"] depends = qtbase path = qtserialport diff --git a/qtserialbus b/qtserialbus index 8dd3e459..e31f6176 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 8dd3e45961b7098bc50649cfb8191eb3cbdf19e8 +Subproject commit e31f61763d347de933c60d808f941d17eaf7f4ee -- cgit v1.2.3 From 9e3b3c838cceb0a161a85f5bd425a2ebc17f5160 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Wed, 9 Oct 2019 13:17:14 +0200 Subject: platform_configs: add a RHEL 7.6 build A preparing for having android build later. * install gcc 7.x * install git 2.x * install a few other dependencies Change-Id: I18f05bdfb78c92b7f05f67609613b5271b400f91 Reviewed-by: Simon Hausmann Reviewed-by: Qt CMake Build Bot --- coin/platform_configs/default.yaml | 18 +++++++-- coin/provisioning/common/unix/install_protobuff.sh | 2 +- .../03-install-devtoolset.sh | 4 +- .../04-install-packages.sh | 12 +++++- .../qtci-linux-RHEL-7.6-x86_64/06-cmake.sh | 43 ---------------------- .../qtci-linux-RHEL-7.6-x86_64/40-install-cmake.sh | 43 ++++++++++++++++++++++ 6 files changed, 71 insertions(+), 51 deletions(-) delete mode 100755 coin/provisioning/qtci-linux-RHEL-7.6-x86_64/06-cmake.sh create mode 100755 coin/provisioning/qtci-linux-RHEL-7.6-x86_64/40-install-cmake.sh diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml index dab36910..0e3aefa6 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -1,12 +1,22 @@ -- Template: 'qtci-linux-Ubuntu-18.04-x86_64' +Version: 2 +Configurations: +- + Template: 'qtci-linux-Ubuntu-18.04-x86_64' Compiler: 'GCC' Configure arguments: '-DBUILD_EXAMPLES=ON -DFEATURE_developer_build=ON' -- Template: 'qtci-linux-openSUSE-15.0-x86_64' +- + Template: 'qtci-linux-openSUSE-15.0-x86_64' Compiler: 'ICC_18' Configure arguments: '-DBUILD_EXAMPLES=OFF -DBUILD_SHARED_LIBS=OFF' -- Template: 'qtci-macos-10.13-x86_64-2' +- + Template: 'qtci-macos-10.13-x86_64-2' Compiler: 'Clang' Configure arguments: '-DBUILD_EXAMPLES=OFF -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode10.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.14.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.12' -- Template: 'qtci-windows-10-x86_64-14' +- + Template: 'qtci-windows-10-x86_64-14' Compiler: 'MSVC2017' Configure arguments: '-DBUILD_EXAMPLES=OFF -DCMAKE_TOOLCHAIN_FILE={{.Env.VCPKG_ROOT}}/scripts/buildsystems/vcpkg.cmake' +- + Template: 'qtci-linux-RHEL-7.6-x86_64' + Compiler: 'GCC' + Configure arguments: '-DBUILD_EXAMPLES=OFF' diff --git a/coin/provisioning/common/unix/install_protobuff.sh b/coin/provisioning/common/unix/install_protobuff.sh index 59e9b699..20e9ab44 100755 --- a/coin/provisioning/common/unix/install_protobuff.sh +++ b/coin/provisioning/common/unix/install_protobuff.sh @@ -53,7 +53,7 @@ sudo rm "$targetFile" # devtoolset is needed when running configuration if uname -a |grep -qv "Darwin"; then - export PATH="/opt/rh/devtoolset-4/root/usr/bin:$PATH" + export PATH="/opt/rh/devtoolset-7/root/usr/bin:$PATH" fi echo "Configuring and building protobuf" diff --git a/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/03-install-devtoolset.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/03-install-devtoolset.sh index ebc7cac6..5d37a53a 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/03-install-devtoolset.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/03-install-devtoolset.sh @@ -35,7 +35,7 @@ set -ex -sudo yum -y install devtoolset-4 +sudo yum -y install devtoolset-7 -echo "source /opt/rh/devtoolset-4/enable" >> ~/.bashrc +echo "source /opt/rh/devtoolset-7/enable" >> ~/.bashrc diff --git a/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/04-install-packages.sh index b956d6a3..6b569552 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/04-install-packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/04-install-packages.sh @@ -38,13 +38,20 @@ set -ex # Remove update notifications and packagekit running in the background sudo yum -y remove PackageKit gnome-software +sudo yum-config-manager --enable rhel-server-rhscl-7-rpms + installPackages=() -installPackages+=(git) +installPackages+=(rh-git29) installPackages+=(zlib-devel) installPackages+=(glib2-devel) installPackages+=(openssl-devel) installPackages+=(freetype-devel) installPackages+=(fontconfig-devel) +# cmake build +installPackages+=(ninja-build) +installPackages+=(pcre2-devel) +installPackages+=(double-conversion-devel) +installPackages+=(zstd) # EGL support installPackages+=(mesa-libEGL-devel) installPackages+=(mesa-libGL-devel) @@ -118,6 +125,9 @@ installPackages+=(vulkan-devel) sudo yum -y install "${installPackages[@]}" +scl enable rh-git29 bash +sudo ln -s /opt/rh/rh-git29/root/usr/bin/git /usr/local/bin/git + sudo ln -s /opt/rh/rh-python36/root/usr/bin/python3 /usr/local/bin/python3 sudo ln -s /opt/rh/rh-python36/root/usr/bin/pip3 /usr/local/bin/pip3 # We shouldn't use yum to install virtualenv. The one found from package repo is not diff --git a/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/06-cmake.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/06-cmake.sh deleted file mode 100755 index 062b2790..00000000 --- a/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/06-cmake.sh +++ /dev/null @@ -1,43 +0,0 @@ -#!/usr/bin/env bash - -############################################################################# -## -## Copyright (C) 2017 The Qt Company Ltd. -## Contact: http://www.qt.io/licensing/ -## -## This file is part of the provisioning scripts 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 CMake 3.6.2 - -set -ex - -# CMake is needed for autotests that verify that Qt can be built with CMake - -# shellcheck source=../common/linux/cmake_linux.sh -source "${BASH_SOURCE%/*}/../common/linux/cmake_linux.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/40-install-cmake.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/40-install-cmake.sh new file mode 100755 index 00000000..062b2790 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/40-install-cmake.sh @@ -0,0 +1,43 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2017 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the provisioning scripts 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 CMake 3.6.2 + +set -ex + +# CMake is needed for autotests that verify that Qt can be built with CMake + +# shellcheck source=../common/linux/cmake_linux.sh +source "${BASH_SOURCE%/*}/../common/linux/cmake_linux.sh" -- cgit v1.2.3 From ecf2f4f38cde8983bb357f6241478ac3170ac9ac Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Thu, 10 Oct 2019 14:57:01 +0200 Subject: provisioning: update python to 3.7 on macos MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTQAINFRA-3271 Change-Id: Ic1645a8b5bc94b0ce6ff58352891af0beabd7649 Reviewed-by: Qt CMake Build Bot Reviewed-by: Alexandru Croitor Reviewed-by: Tony Sarajärvi --- coin/provisioning/common/macos/python3.sh | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/coin/provisioning/common/macos/python3.sh b/coin/provisioning/common/macos/python3.sh index 35bccc93..185c3b01 100755 --- a/coin/provisioning/common/macos/python3.sh +++ b/coin/provisioning/common/macos/python3.sh @@ -2,7 +2,7 @@ ############################################################################# ## -## Copyright (C) 2017 The Qt Company Ltd. +## Copyright (C) 2019 The Qt Company Ltd. ## Copyright (C) 2017 Pelagicore AG ## Contact: http://www.qt.io/licensing/ ## @@ -43,23 +43,23 @@ source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" # shellcheck source=./pip.sh source "${BASH_SOURCE%/*}/pip.sh" -PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/python-3.6.1-macosx10.6.pkg" -AltUrl="https://www.python.org/ftp/python/3.6.1/python-3.6.1-macosx10.6.pkg" -SHA1="ae0c749544c2d573c3cc29c4c2d7d9a595db28f9" +PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/python-3.7.4-macosx10.9.pkg" +AltUrl="https://www.python.org/ftp/python/3.7.4/python-3.7.4-macosx10.9.pkg" +SHA1="ef8a6b1abba6a6e8553916a881af440705653fa8" DestDir="/" InstallPKGFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$DestDir" -InstallPip python3.6 +InstallPip python3.7 -/Library/Frameworks/Python.framework/Versions/3.6/bin/pip3 install virtualenv wheel +/Library/Frameworks/Python.framework/Versions/3.7/bin/pip3 install virtualenv wheel -SetEnvVar "PYTHON3_PATH" "/Library/Frameworks/Python.framework/Versions/3.6/bin" -SetEnvVar "PIP3_PATH" "/Library/Frameworks/Python.framework/Versions/3.6/bin" +SetEnvVar "PYTHON3_PATH" "/Library/Frameworks/Python.framework/Versions/3.7/bin" +SetEnvVar "PIP3_PATH" "/Library/Frameworks/Python.framework/Versions/3.7/bin" # Install all needed packages in a special wheel cache directory -/Library/Frameworks/Python.framework/Versions/3.6/bin/pip3 wheel --wheel-dir $HOME/python3-wheels -r ${BASH_SOURCE%/*}/../shared/requirements.txt +/Library/Frameworks/Python.framework/Versions/3.7/bin/pip3 wheel --wheel-dir $HOME/python3-wheels -r ${BASH_SOURCE%/*}/../shared/requirements.txt SetEnvVar "PYTHON3_WHEEL_CACHE" "$HOME/python3-wheels" -echo "python3 = 3.6.1" >> ~/versions.txt +echo "python3 = 3.7.4" >> ~/versions.txt -- cgit v1.2.3 From 0c687679c7cd434728e614a181301e03d5b87ff5 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Wed, 9 Oct 2019 13:19:25 +0200 Subject: platform_configs: add Android arm64 build on RHEL 7.6 host * install vcpkg and for android * a remaining issue in vcpkg: https://github.com/microsoft/vcpkg/issues/8506 Task-number: QTBUG-78945 Change-Id: I484612e2157bf1c1142934cc4f27729e8be37b89 Reviewed-by: Simon Hausmann Reviewed-by: Qt CMake Build Bot --- coin/platform_configs/default.yaml | 8 +++ coin/provisioning/common/linux/vcpkg.sh | 72 ++++++++++++++++++++++ .../qtci-linux-RHEL-7.6-x86_64/56-vcpkg.sh | 5 ++ 3 files changed, 85 insertions(+) create mode 100755 coin/provisioning/common/linux/vcpkg.sh create mode 100755 coin/provisioning/qtci-linux-RHEL-7.6-x86_64/56-vcpkg.sh diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml index 0e3aefa6..6b0ddd46 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -20,3 +20,11 @@ Configurations: Template: 'qtci-linux-RHEL-7.6-x86_64' Compiler: 'GCC' Configure arguments: '-DBUILD_EXAMPLES=OFF' +- + Template: 'qtci-linux-RHEL-7.6-x86_64' + Target os: 'Android_ANY' + Target arch: 'arm64' + Compiler: 'GCC' + Target compiler: 'Clang' + Configure arguments: '-DBUILD_EXAMPLES=OFF' + Environment variables: ['TARGET_CONFIGURE_ARGS=-DBUILD_EXAMPLES=OFF -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_HOME}} -DANDROID_ABI=arm64-v8a -DVCPKG_TARGET_TRIPLET=arm64-android'] diff --git a/coin/provisioning/common/linux/vcpkg.sh b/coin/provisioning/common/linux/vcpkg.sh new file mode 100755 index 00000000..a25e91a1 --- /dev/null +++ b/coin/provisioning/common/linux/vcpkg.sh @@ -0,0 +1,72 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2019 The Qt Company Ltd. +## Contact: https://www.qt.io/licensing/ +## +## This file is part of the provisioning scripts 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$ +## +############################################################################# + +set -ex + +source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" + +# This script installs VcPkg. It is used to provide third-party libraries when cross-compiling +# for example for Emscripten or Android. + +# Refresh to make sure we have the EMSCRIPTEN environment variable, needed for the vcpkg wasm build. +source ~/.bashrc + +version="qt-snapshot-2019-10-09" +officialUrl="https://codeload.github.com/tronical/vcpkg/tar.gz/$version" +targetFile="vcpkg.tar.gz" +targetFolder="$HOME/vcpkg" + +wget --tries=5 --waitretry=5 --progress=dot:giga --output-document="$targetFile" "$officialUrl" + +if [ ! -d "${targetFolder}" ]; then + mkdir -p $targetFolder +fi + +tar -C $targetFolder --strip-components=1 -xvzf $targetFile +rm -rf $targetFile + +SetEnvVar "VCPKG_ROOT" "$targetFolder" + +cd $targetFolder +./bootstrap-vcpkg.sh + +./vcpkg install --triplet arm-android @qt-packages-android.txt +./vcpkg install --triplet arm64-android @qt-packages-android.txt +./vcpkg install --triplet x86-android @qt-packages-android.txt +./vcpkg install --triplet x64-android @qt-packages-android.txt + +rm -rf packages buildtrees downloads + +echo "VCPKG = $version" >> ~/versions.txt diff --git a/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/56-vcpkg.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/56-vcpkg.sh new file mode 100755 index 00000000..5c7f3f1d --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/56-vcpkg.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env bash + +set -ex + +"$(dirname "$0")/../common/linux/vcpkg.sh" -- cgit v1.2.3 From 33d9eb2b99c4edd5c9c77ccad4b1eeaf93849122 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Thu, 17 Oct 2019 16:25:22 +0200 Subject: Work around cmake issue breaking C++ feature detection on Android As per https://gitlab.kitware.com/cmake/cmake/issues/19515, the version of CMake we're currently using in the CI has an issue detecting clang as GNU compatible C++ frontend and thus fails to convert the values in the CMAKE_C/CXX_STANDARD variables to compiler flags correctly. Work around this for now as suggested in the upstream ticket. We can remove this when upgrading to a newer cmake version. Change-Id: I0ea37503c086ff86e05c50b812474522a7737b20 Reviewed-by: Alexandru Croitor --- coin/platform_configs/default.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml index 6b0ddd46..5236af9c 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -27,4 +27,4 @@ Configurations: Compiler: 'GCC' Target compiler: 'Clang' Configure arguments: '-DBUILD_EXAMPLES=OFF' - Environment variables: ['TARGET_CONFIGURE_ARGS=-DBUILD_EXAMPLES=OFF -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_HOME}} -DANDROID_ABI=arm64-v8a -DVCPKG_TARGET_TRIPLET=arm64-android'] + Environment variables: ['TARGET_CONFIGURE_ARGS=-DBUILD_EXAMPLES=OFF -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_HOME}} -DANDROID_ABI=arm64-v8a -DVCPKG_TARGET_TRIPLET=arm64-android -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU'] -- cgit v1.2.3 From a331d9e65555c4322810815409f989b612706fc0 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 18 Oct 2019 15:30:08 +0200 Subject: Update submodules on 'wip/cmake' in qt/qt5 Change-Id: I083e08e3c24c1d29d7fedc69490187765a651b12 Reviewed-by: Qt CMake Build Bot Reviewed-by: Simon Hausmann --- qtbase | 2 +- qtdeclarative | 2 +- qtgamepad | 2 +- qtgraphicaleffects | 2 +- qtimageformats | 2 +- qtnetworkauth | 2 +- qtrepotools | 2 +- qtscxml | 2 +- qtsvg | 2 +- qttools | 2 +- qtwebsockets | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/qtbase b/qtbase index b7adc856..78b89547 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit b7adc85642584be26a1870617a9aa83c16e40cfb +Subproject commit 78b89547ad00153a8e02553a2e87d45415bd2314 diff --git a/qtdeclarative b/qtdeclarative index 5f07a0e1..771b6f59 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 5f07a0e1149ed3df41f3ff5ef55f3f8bbad99909 +Subproject commit 771b6f59e2df79f5a0cbf50b592d73ec131cc6a9 diff --git a/qtgamepad b/qtgamepad index 938e499f..9e379c00 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit 938e499f724edf8b86c27a6800f0800d10ceacc6 +Subproject commit 9e379c00db3d5d259f4a31a755628f69e058a4ed diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 93d9b1e8..46f75ef4 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 93d9b1e891666137f475223d1855d202f97045b1 +Subproject commit 46f75ef4912d2a677bee4b76af1de0b7f4a37f04 diff --git a/qtimageformats b/qtimageformats index 1d4a58a8..5a6f87a2 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 1d4a58a877b8b28074ca84a07340d2d8604b38d6 +Subproject commit 5a6f87a2d368639673e1527c2efc03e236ac1812 diff --git a/qtnetworkauth b/qtnetworkauth index cd5e9aa3..56e67ef8 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit cd5e9aa39f192f8265064e59e7771241f81a5f9c +Subproject commit 56e67ef8cb06071d69d75d75b131d476a65d17cd diff --git a/qtrepotools b/qtrepotools index a51db43b..1bf0cbf1 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit a51db43b580f774c64275cd3e1e0c707de2a04a4 +Subproject commit 1bf0cbf1e48bb768f50e93cf112d81d423322e39 diff --git a/qtscxml b/qtscxml index 5fe75751..32f10df7 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 5fe75751ed90354eb0968f528974592003c65460 +Subproject commit 32f10df75c789477091770ae01bb26643a66fd87 diff --git a/qtsvg b/qtsvg index e5b211a4..98a62da5 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit e5b211a4adc313cc10d1216ff3e8a166b562137b +Subproject commit 98a62da5b2dd622dd896b43c6b8a58eec0332b31 diff --git a/qttools b/qttools index 342f402c..bd94ebbc 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 342f402c002f1bfcc842dd7711b040de4e2b27e7 +Subproject commit bd94ebbc85cc42564a618eed2e5fb7bcac8753aa diff --git a/qtwebsockets b/qtwebsockets index 5feeb586..539d5597 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 5feeb5867d032cc4641ee088cfa5bd9063bcf5cd +Subproject commit 539d5597491893c939c7a05ff4d45261e949e9ce -- cgit v1.2.3 From edf685187505b42290f2ad6d9eb4c4b1107b684c Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 23 Oct 2019 23:01:41 +0200 Subject: Update submodules on 'wip/cmake' in qt/qt5 Change-Id: Ice21b858ec75f6319bee745c47790293e0f3d4d1 Reviewed-by: Qt CMake Build Bot Reviewed-by: Simon Hausmann --- qtbase | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtbase b/qtbase index 78b89547..f2cb720e 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 78b89547ad00153a8e02553a2e87d45415bd2314 +Subproject commit f2cb720e3fc465c96314f35ae621a2ae977b1e0e -- cgit v1.2.3 From bf87526ff08f273cb89b0765e174258dcdab7e67 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Thu, 24 Oct 2019 17:11:35 +0200 Subject: Add QtConnectivity Now that the cmake port landed Change-Id: I5218a23fffd8de736ffcf5e039d369aec0827f42 Reviewed-by: Alexandru Croitor Reviewed-by: Qt CMake Build Bot --- .gitmodules | 4 ++-- qtconnectivity | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 9167958c..f004618a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -123,8 +123,8 @@ recommends = qtdeclarative qtandroidextras path = qtconnectivity url = ../qtconnectivity.git - branch = dev - status = ignore + branch = wip/cmake + status = addon [submodule "qtwayland"] depends = qtbase recommends = qtdeclarative diff --git a/qtconnectivity b/qtconnectivity index b58c4709..b50a574c 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit b58c470962aa6831f53d088afd523c1b1530fbc8 +Subproject commit b50a574c8e2bf77c17fea3bfd490deb9b5fccace -- cgit v1.2.3 From 3693303aa5349b16bf5aa876862e9bc065f4d304 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 24 Oct 2019 23:01:39 +0200 Subject: Update submodules on 'wip/cmake' in qt/qt5 Change-Id: Iad5169b8d1b2a00105df7a4ac2fc0fb6e3537832 Reviewed-by: Qt CMake Build Bot Reviewed-by: Simon Hausmann --- qtbase | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtbase b/qtbase index f2cb720e..340763d1 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit f2cb720e3fc465c96314f35ae621a2ae977b1e0e +Subproject commit 340763d1ff55b740acec34537c8f1140064e6393 -- cgit v1.2.3 From 12a647fbe5d238c5f603f79a431846d5b1637d33 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 27 Oct 2019 23:01:22 +0100 Subject: Update submodules on 'wip/cmake' in qt/qt5 Change-Id: Ib2187b662c55268f101640b32c98cf9cd325a66e Reviewed-by: Liang Qi Reviewed-by: Qt CMake Build Bot --- qtbase | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtbase b/qtbase index 340763d1..d183c21a 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 340763d1ff55b740acec34537c8f1140064e6393 +Subproject commit d183c21a2cde1b4d987e1f4497611b0fe586bdc1 -- cgit v1.2.3 From 010595af45ffd3ba4b5f053113c326b135e14a82 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 29 Oct 2019 09:24:22 +0100 Subject: Update submodules on 'wip/cmake' in qt/qt5 Change-Id: I23f2cf4a7577df02e3e7b8590aede4d755117cb1 Reviewed-by: Qt CMake Build Bot Reviewed-by: Liang Qi --- qtbase | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtbase b/qtbase index d183c21a..0cab837f 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit d183c21a2cde1b4d987e1f4497611b0fe586bdc1 +Subproject commit 0cab837fd7af5511338c42e46aaaa49b070a3da8 -- cgit v1.2.3 From 0fb525f9ef335633c0aa4c65e818e9ab5ce4e1ee Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Tue, 29 Oct 2019 13:03:18 +0100 Subject: Add x11extras to the qt5 build Change-Id: Iac7273717b7dff510c79cd6151349e6ddb6a5e56 Reviewed-by: Alexandru Croitor Reviewed-by: Qt CMake Build Bot --- .gitmodules | 4 ++-- qtx11extras | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index f004618a..a0f11be2 100644 --- a/.gitmodules +++ b/.gitmodules @@ -175,8 +175,8 @@ depends = qtbase path = qtx11extras url = ../qtx11extras.git - branch = dev - status = ignore + branch = wip/cmake + status = addon [submodule "qtmacextras"] depends = qtbase path = qtmacextras diff --git a/qtx11extras b/qtx11extras index 4e35f08d..f73456e1 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit 4e35f08d17c277e36fa5fb636b374b3d1dceb764 +Subproject commit f73456e18e0fbe959e623c94bd1ebb23769f7e34 -- cgit v1.2.3 From eaa76d4db81c2dcc2e327a0acfac4fdfa7cfc01d Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 29 Oct 2019 23:01:37 +0100 Subject: Update submodules on 'wip/cmake' in qt/qt5 Change-Id: I51d0e6deeb53b1eabe2796dc958ebf9cf536e8f7 Reviewed-by: Qt CMake Build Bot Reviewed-by: Liang Qi --- qtbase | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtbase b/qtbase index 0cab837f..3e5e7b82 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 0cab837fd7af5511338c42e46aaaa49b070a3da8 +Subproject commit 3e5e7b82012b99231492f48a202044369cb76c0d -- cgit v1.2.3 From 83ae62a099e325cba717ddc5bc0b5a966b491c5a Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 30 Oct 2019 23:01:28 +0100 Subject: Update submodules on 'wip/cmake' in qt/qt5 Change-Id: I84f7dfd1bcbfe889c5f3e4861297f661d50aa393 Reviewed-by: Qt CMake Build Bot Reviewed-by: Liang Qi --- qtrepotools | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtrepotools b/qtrepotools index 1bf0cbf1..0028759f 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 1bf0cbf1e48bb768f50e93cf112d81d423322e39 +Subproject commit 0028759fdab4f2a5d59b1ec3cfc34d2c992e9d94 -- cgit v1.2.3 From a25f221e07b4d79e12b6aca2d77cefbf5eb355f5 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 31 Oct 2019 23:01:38 +0100 Subject: Update submodules on 'wip/cmake' in qt/qt5 Change-Id: Ifd37d952b51fe8c37d4ff2b99efec21c87d52f8c Reviewed-by: Qt CMake Build Bot Reviewed-by: Liang Qi --- qtbase | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtbase b/qtbase index 3e5e7b82..92fdc6b2 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 3e5e7b82012b99231492f48a202044369cb76c0d +Subproject commit 92fdc6b2ea76aef39d33f068d50aa341967cbaec -- cgit v1.2.3 From 7c563fc6629314ae870222f297ff8d44749d7dd5 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 1 Nov 2019 23:01:36 +0100 Subject: Update submodules on 'wip/cmake' in qt/qt5 Change-Id: Ie50bc298a4743b348ad91d9f4efee97482ec55a4 Reviewed-by: Qt CMake Build Bot Reviewed-by: Liang Qi --- qtbase | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtbase b/qtbase index 92fdc6b2..e7118bd7 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 92fdc6b2ea76aef39d33f068d50aa341967cbaec +Subproject commit e7118bd7fd42479014c9610c90fc1cd0014fd0c8 -- cgit v1.2.3 From d939b369d286a87e21ad80de8e449c1629f1a941 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 4 Nov 2019 23:01:41 +0100 Subject: Update submodules on 'wip/cmake' in qt/qt5 Change-Id: I41c2406329c56d6c82a3d7c27b364adae366b79f Reviewed-by: Qt CMake Build Bot Reviewed-by: Liang Qi --- qtbase | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtbase b/qtbase index e7118bd7..344e4ec8 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit e7118bd7fd42479014c9610c90fc1cd0014fd0c8 +Subproject commit 344e4ec827ba74266454800bcd29d4a5618c0e40 -- cgit v1.2.3 From 4e5a86d2bbe6cd30e46a364f96a861b37bbf7f96 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 7 Nov 2019 07:37:07 +0100 Subject: Update submodules on 'wip/cmake' in qt/qt5 Change-Id: I140d2692932cc10d4bedd45e149c804ec7329885 Reviewed-by: Qt CMake Build Bot Reviewed-by: Liang Qi --- qtdeclarative | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtdeclarative b/qtdeclarative index 771b6f59..82525a2b 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 771b6f59e2df79f5a0cbf50b592d73ec131cc6a9 +Subproject commit 82525a2b3861ad695c156c2cac4239134f8ac922 -- cgit v1.2.3 From 8eab11f6961f146fa9a4bc9c523504694d880c02 Mon Sep 17 00:00:00 2001 From: Leander Beernaert Date: Thu, 17 Oct 2019 11:28:24 +0200 Subject: Update CMake to version 3.15.5 Update required as there's a bug with setting the CXX_STANDARD on android. Updating to this version fixes the issue. Change-Id: I50b0bc2941e0919232b46bbf5b28133149878649 Reviewed-by: Liang Qi --- coin/provisioning/common/linux/cmake_linux.sh | 4 ++-- coin/provisioning/common/macos/cmake.sh | 10 +++++----- coin/provisioning/common/windows/cmake.ps1 | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/coin/provisioning/common/linux/cmake_linux.sh b/coin/provisioning/common/linux/cmake_linux.sh index 08a69abc..38c515a6 100755 --- a/coin/provisioning/common/linux/cmake_linux.sh +++ b/coin/provisioning/common/linux/cmake_linux.sh @@ -43,10 +43,10 @@ source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh" source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" majorminorversion="3.15" -version="3.15.0-rc1" +version="3.15.5" PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/cmake/cmake-$version-Linux-x86_64.tar.gz" AltUrl="https://cmake.org/files/v$majorminorversion/cmake-$version-Linux-x86_64.tar.gz" -SHA1="5e4d2b4478485f1a16c91463fc91eea3a9487b7a" +SHA1="867f44e232346b79167b64cb5380bc0955e953fb" targetFolder="/opt/cmake-$version" appPrefix="cmake-$version-Linux-x86_64" diff --git a/coin/provisioning/common/macos/cmake.sh b/coin/provisioning/common/macos/cmake.sh index ed49de81..cb0a24d7 100755 --- a/coin/provisioning/common/macos/cmake.sh +++ b/coin/provisioning/common/macos/cmake.sh @@ -42,13 +42,13 @@ source "${BASH_SOURCE%/*}/InstallAppFromCompressedFileFromURL.sh" # shellcheck source=../unix/SetEnvVar.sh source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" -PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/macos_10.13_high_sierra/cmake-3.15.0-rc1-Darwin-x86_64.tar.gz" -AltUrl="https://cmake.org/files/v3.15/cmake-3.15.0-rc1-Darwin-x86_64.tar.gz" -SHA1="94b6aa5f36fd20811eb6c5c036bb2ec154f2d652" -appPrefix="cmake-3.15.0-rc1-Darwin-x86_64" +PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/macos_10.13_high_sierra/cmake-3.15.5-Darwin-x86_64.tar.gz" +AltUrl="https://cmake.org/files/v3.15/cmake-3.15.5-Darwin-x86_64.tar.gz" +SHA1="a12dcf2a124ae77ddef7269e6731ab0d63ec7c64" +appPrefix="cmake-3.15.5-Darwin-x86_64" InstallAppFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$appPrefix" SetEnvVar "PATH" "/Applications/CMake.app/Contents/bin:\$PATH" -echo "CMake = 3.15.0-rc1" >> ~/versions.txt +echo "CMake = 3.15.5" >> ~/versions.txt diff --git a/coin/provisioning/common/windows/cmake.ps1 b/coin/provisioning/common/windows/cmake.ps1 index 3367440b..256d2439 100644 --- a/coin/provisioning/common/windows/cmake.ps1 +++ b/coin/provisioning/common/windows/cmake.ps1 @@ -34,7 +34,7 @@ . "$PSScriptRoot\helpers.ps1" $majorminorversion = "3.15" -$version = "3.15.0-rc1" +$version = "3.15.5" $zip = Get-DownloadLocation ("cmake-" + $version + "-win32-x86.zip") $officialurl = "https://cmake.org/files/v" + $majorminorversion + "/cmake-" + $version + "-win32-x86.zip" @@ -44,7 +44,7 @@ Write-Host "Removing old cmake" Remove-Item "C:\CMake" -Force -Recurse -ErrorAction SilentlyContinue Download $officialurl $cachedurl $zip -Verify-Checksum $zip "3739F2FF0CAD6EC15475A32D419EBEB0864C4800" +Verify-Checksum $zip "3ccd9fb7ffcc0bef9bcb2c6ab105ee6a5148b7bf" Extract-7Zip $zip C: $defaultinstallfolder = "C:\cmake-" + $version + "-win32-x86" -- cgit v1.2.3 From 1aa25c10840f702fd9155b3bf394c89817a8e2b9 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Wed, 9 Oct 2019 16:32:59 +0200 Subject: Bump vcpkg to a new snapshot Some patches were upstreamed and this beings the version in line with what we need for Android. This patch also centralizes the version into a shared file, for future use. Change-Id: I90973f9bfcbc1bfeb2d11e2ee7a7fa4e4f6a58a2 Reviewed-by: Qt CMake Build Bot Reviewed-by: Liang Qi --- coin/provisioning/common/linux/vcpkg.sh | 7 ++++--- coin/provisioning/common/shared/vcpkg_version.txt | 1 + coin/provisioning/common/windows/install-vcpkg.ps1 | 9 ++++++--- 3 files changed, 11 insertions(+), 6 deletions(-) create mode 100644 coin/provisioning/common/shared/vcpkg_version.txt diff --git a/coin/provisioning/common/linux/vcpkg.sh b/coin/provisioning/common/linux/vcpkg.sh index a25e91a1..35f2ece8 100755 --- a/coin/provisioning/common/linux/vcpkg.sh +++ b/coin/provisioning/common/linux/vcpkg.sh @@ -43,8 +43,9 @@ source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" # Refresh to make sure we have the EMSCRIPTEN environment variable, needed for the vcpkg wasm build. source ~/.bashrc -version="qt-snapshot-2019-10-09" -officialUrl="https://codeload.github.com/tronical/vcpkg/tar.gz/$version" +source "${BASH_SOURCE%/*}/../shared/vcpkg_version.txt" + +officialUrl="https://codeload.github.com/tronical/vcpkg/tar.gz/$vcpkg_version" targetFile="vcpkg.tar.gz" targetFolder="$HOME/vcpkg" @@ -69,4 +70,4 @@ cd $targetFolder rm -rf packages buildtrees downloads -echo "VCPKG = $version" >> ~/versions.txt +echo "VCPKG = $vcpkg_version" >> ~/versions.txt diff --git a/coin/provisioning/common/shared/vcpkg_version.txt b/coin/provisioning/common/shared/vcpkg_version.txt new file mode 100644 index 00000000..993101eb --- /dev/null +++ b/coin/provisioning/common/shared/vcpkg_version.txt @@ -0,0 +1 @@ +vcpkg_version=qt-snapshot-2019-10-09 diff --git a/coin/provisioning/common/windows/install-vcpkg.ps1 b/coin/provisioning/common/windows/install-vcpkg.ps1 index 36b0d826..52f1518f 100644 --- a/coin/provisioning/common/windows/install-vcpkg.ps1 +++ b/coin/provisioning/common/windows/install-vcpkg.ps1 @@ -36,15 +36,18 @@ Write-Host "Installing vcpkg" -$version = "qt-snapshot-2019-06-20" -$officialUrl = "https://codeload.github.com/tronical/vcpkg/zip/$version" +$n = Get-Content "$PSScriptRoot\..\shared\vcpkg_version.txt" +$n = $n.Split('=') +New-Variable -Name $n[0] -Value $n[1] + +$officialUrl = "https://codeload.github.com/tronical/vcpkg/zip/$vcpkg_version" $zip = "C:\Utils\vcpkg.zip" Download "$officialUrl" "" "$zip" Extract-7Zip "$zip" c:\utils Remove-Item $zip -$installationFolder = "c:\utils\vcpkg-$version" +$installationFolder = "c:\utils\vcpkg-$vcpkg_version" cd $installationFolder -- cgit v1.2.3 From df8310ced1f6ab703af5630852c83b135962fc86 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 12 Nov 2019 23:01:39 +0100 Subject: Update submodules on 'wip/cmake' in qt/qt5 Change-Id: I26274b1707fd4d12a4da5503b9a414414f29148b Reviewed-by: Qt CMake Build Bot Reviewed-by: Liang Qi --- qtbase | 2 +- qtconnectivity | 2 +- qtimageformats | 2 +- qttools | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qtbase b/qtbase index 344e4ec8..9e6456a4 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 344e4ec827ba74266454800bcd29d4a5618c0e40 +Subproject commit 9e6456a49d52197ab75ed13b3be8ca711862f261 diff --git a/qtconnectivity b/qtconnectivity index b50a574c..782cbca1 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit b50a574c8e2bf77c17fea3bfd490deb9b5fccace +Subproject commit 782cbca1dcceef80a64dd1310ea854824c54665d diff --git a/qtimageformats b/qtimageformats index 5a6f87a2..416cb155 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 5a6f87a2d368639673e1527c2efc03e236ac1812 +Subproject commit 416cb155b16d8ab44a4a0313ab07ee6af6913208 diff --git a/qttools b/qttools index bd94ebbc..f46489d8 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit bd94ebbc85cc42564a618eed2e5fb7bcac8753aa +Subproject commit f46489d856c347d38fac502f75370c87c83b8cee -- cgit v1.2.3 From 3903c2a72de7d6560039632324939ed051ab0533 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 14 Nov 2019 11:05:10 +0100 Subject: Update submodules on 'wip/cmake' in qt/qt5 Change-Id: I28901d350b1f16b9a6b3d9776ee8055ea3356ade Reviewed-by: Qt CMake Build Bot Reviewed-by: Alexandru Croitor --- qtbase | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtbase b/qtbase index 9e6456a4..e9a58ba9 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 9e6456a49d52197ab75ed13b3be8ca711862f261 +Subproject commit e9a58ba9e55467f8c69e19dd52c2afa7cbb39529 -- cgit v1.2.3 From eabc1ed5bd46a7882c5b98a19716e3b9aef694fa Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Thu, 14 Nov 2019 18:24:29 +0100 Subject: Add a few more ported repos to qt5.git wip/cmake Change-Id: I9f7215d3df0ba07af337262dd5e43bfc79e0a97a Reviewed-by: Simon Hausmann --- .gitmodules | 6 +++--- qtquickcontrols2 | 2 +- qtremoteobjects | 2 +- qtwinextras | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitmodules b/.gitmodules index a0f11be2..0507f678 100644 --- a/.gitmodules +++ b/.gitmodules @@ -189,7 +189,7 @@ path = qtwinextras url = ../qtwinextras.git branch = dev - status = ignore + status = addon [submodule "qtandroidextras"] depends = qtbase path = qtandroidextras @@ -237,7 +237,7 @@ path = qtquickcontrols2 url = ../qtquickcontrols2.git branch = dev - status = ignore + status = essential [submodule "qtpurchasing"] depends = qtbase recommends = qtdeclarative qtandroidextras @@ -298,7 +298,7 @@ path = qtremoteobjects url = ../qtremoteobjects.git branch = dev - status = ignore + status = addon [submodule "qtwebglplugin"] depends = qtbase qtwebsockets recommends = qtdeclarative diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 247dad29..6f617349 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 247dad297cb7f8d5af42434c67d24ffcc7bae017 +Subproject commit 6f617349cf865ca3a7befc0dd472b7c2510fc431 diff --git a/qtremoteobjects b/qtremoteobjects index d9b4c020..a959d167 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit d9b4c020eb158d7fceb439ff66f7ce5db5a9df5b +Subproject commit a959d167858aa4708b82e7b61efc9db7243c1844 diff --git a/qtwinextras b/qtwinextras index c496ca49..81694252 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit c496ca49dc0a01edcb0576818dab705ff5e02fec +Subproject commit 816942521342e9a8c4c279fb6c759e65c8ff56be -- cgit v1.2.3 From a72db33bfc9acc20de9bce0c2c5a24c59d90fa04 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 14 Nov 2019 23:01:53 +0100 Subject: Update submodules on 'wip/cmake' in qt/qt5 Change-Id: Ia7d77b5f456e4e6196cacc179952e104476d968f Reviewed-by: Qt CMake Build Bot Reviewed-by: Liang Qi --- qtbase | 2 +- qtdeclarative | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qtbase b/qtbase index e9a58ba9..7a6c6da2 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit e9a58ba9e55467f8c69e19dd52c2afa7cbb39529 +Subproject commit 7a6c6da2ebbfef33f7284ce5c96aa0c3acabc6bc diff --git a/qtdeclarative b/qtdeclarative index 82525a2b..387f360b 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 82525a2b3861ad695c156c2cac4239134f8ac922 +Subproject commit 387f360b3b2634094889478f2b258e65a70b9aa6 -- cgit v1.2.3 From 3ba8bdeda0fd23bec9de10cb4cf962b50a535af6 Mon Sep 17 00:00:00 2001 From: Leander Beernaert Date: Mon, 25 Nov 2019 10:54:17 +0100 Subject: Update qt5.git Change-Id: Ie922b8e2989215de4efd3596e6532b201a3e7d0c Reviewed-by: Alexandru Croitor --- .gitmodules | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtquickcontrols2 | 2 +- qtserialbus | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitmodules b/.gitmodules index 0507f678..a161c519 100644 --- a/.gitmodules +++ b/.gitmodules @@ -236,7 +236,7 @@ recommends = qtimageformats path = qtquickcontrols2 url = ../qtquickcontrols2.git - branch = dev + branch = wip/cmake status = essential [submodule "qtpurchasing"] depends = qtbase diff --git a/qtbase b/qtbase index 7a6c6da2..1c655fb0 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 7a6c6da2ebbfef33f7284ce5c96aa0c3acabc6bc +Subproject commit 1c655fb0fc08e89ab5efb23889266b710334f1a5 diff --git a/qtdeclarative b/qtdeclarative index 387f360b..f500062e 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 387f360b3b2634094889478f2b258e65a70b9aa6 +Subproject commit f500062e165975e112ea644da1d6a3d4c413be2a diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 6f617349..2bd4f5cd 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 6f617349cf865ca3a7befc0dd472b7c2510fc431 +Subproject commit 2bd4f5cd587e258227c69b3124757d7b8e019c9f diff --git a/qtserialbus b/qtserialbus index e31f6176..a3e6b5b9 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit e31f61763d347de933c60d808f941d17eaf7f4ee +Subproject commit a3e6b5b9617d2f87e00158ae4b15e8db3e9c656e -- cgit v1.2.3 From 95c7b90309de24badd51aa8017e8145c7f2e655e Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Fri, 22 Nov 2019 20:10:43 +0100 Subject: Update CMake to version 3.16.0-rc4 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I4fc1f412888e1915ae2110320c18fb39a9600b94 Reviewed-by: Qt CMake Build Bot Reviewed-by: Tony Sarajärvi --- coin/provisioning/common/linux/cmake_linux.sh | 8 ++++---- coin/provisioning/common/macos/cmake.sh | 12 +++++++----- coin/provisioning/common/windows/cmake.ps1 | 6 +++--- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/coin/provisioning/common/linux/cmake_linux.sh b/coin/provisioning/common/linux/cmake_linux.sh index 38c515a6..f03bd16c 100755 --- a/coin/provisioning/common/linux/cmake_linux.sh +++ b/coin/provisioning/common/linux/cmake_linux.sh @@ -33,7 +33,7 @@ ## ############################################################################# -# This script installs CMake 3.15.0-rc1 +# This script installs CMake # CMake is needed for autotests that verify that Qt can be built with CMake @@ -42,11 +42,11 @@ source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh" # shellcheck source=../unix/SetEnvVar.sh source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" -majorminorversion="3.15" -version="3.15.5" +majorminorversion="3.16" +version="3.16.0-rc4" PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/cmake/cmake-$version-Linux-x86_64.tar.gz" AltUrl="https://cmake.org/files/v$majorminorversion/cmake-$version-Linux-x86_64.tar.gz" -SHA1="867f44e232346b79167b64cb5380bc0955e953fb" +SHA1="def260a8f27d3b1b9c3d042ec936236598bea52a" targetFolder="/opt/cmake-$version" appPrefix="cmake-$version-Linux-x86_64" diff --git a/coin/provisioning/common/macos/cmake.sh b/coin/provisioning/common/macos/cmake.sh index cb0a24d7..8e20586b 100755 --- a/coin/provisioning/common/macos/cmake.sh +++ b/coin/provisioning/common/macos/cmake.sh @@ -42,13 +42,15 @@ source "${BASH_SOURCE%/*}/InstallAppFromCompressedFileFromURL.sh" # shellcheck source=../unix/SetEnvVar.sh source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" -PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/macos_10.13_high_sierra/cmake-3.15.5-Darwin-x86_64.tar.gz" -AltUrl="https://cmake.org/files/v3.15/cmake-3.15.5-Darwin-x86_64.tar.gz" -SHA1="a12dcf2a124ae77ddef7269e6731ab0d63ec7c64" -appPrefix="cmake-3.15.5-Darwin-x86_64" +majorminorversion="3.16" +version="3.16.0-rc4" +PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/cmake/cmake-$version-Darwin-x86_64.tar.gz" +AltUrl="https://cmake.org/files/v$majorminorversion/cmake-$version-Darwin-x86_64.tar.gz" +SHA1="a2727f4f01329b5b8154840e9ba0de37e3fb14d5" +appPrefix="cmake-$version-Darwin-x86_64" InstallAppFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$appPrefix" SetEnvVar "PATH" "/Applications/CMake.app/Contents/bin:\$PATH" -echo "CMake = 3.15.5" >> ~/versions.txt +echo "CMake = $version" >> ~/versions.txt diff --git a/coin/provisioning/common/windows/cmake.ps1 b/coin/provisioning/common/windows/cmake.ps1 index 256d2439..bbec4b4f 100644 --- a/coin/provisioning/common/windows/cmake.ps1 +++ b/coin/provisioning/common/windows/cmake.ps1 @@ -33,8 +33,8 @@ . "$PSScriptRoot\helpers.ps1" -$majorminorversion = "3.15" -$version = "3.15.5" +$majorminorversion = "3.16" +$version = "3.16.0-rc4" $zip = Get-DownloadLocation ("cmake-" + $version + "-win32-x86.zip") $officialurl = "https://cmake.org/files/v" + $majorminorversion + "/cmake-" + $version + "-win32-x86.zip" @@ -44,7 +44,7 @@ Write-Host "Removing old cmake" Remove-Item "C:\CMake" -Force -Recurse -ErrorAction SilentlyContinue Download $officialurl $cachedurl $zip -Verify-Checksum $zip "3ccd9fb7ffcc0bef9bcb2c6ab105ee6a5148b7bf" +Verify-Checksum $zip "989e5c6384870a77425f2ddbbf305bd3f6dad426" Extract-7Zip $zip C: $defaultinstallfolder = "C:\cmake-" + $version + "-win32-x86" -- cgit v1.2.3 From 61ffa2778f45df3b0db1fa1b5d871f753c1c755f Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Fri, 29 Nov 2019 13:39:43 +0100 Subject: Update submodules on 'wip/cmake' in qt/qt5 Change-Id: Id0fb114e7d4e4bc66d8a51e91ebc8de166229fb6 Reviewed-by: Qt CMake Build Bot Reviewed-by: Liang Qi --- qtbase | 2 +- qtconnectivity | 2 +- qtgamepad | 2 +- qtgraphicaleffects | 2 +- qtimageformats | 2 +- qtnetworkauth | 2 +- qtscxml | 2 +- qtserialport | 2 +- qtsvg | 2 +- qttools | 2 +- qtwebsockets | 2 +- qtx11extras | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/qtbase b/qtbase index 1c655fb0..8dc49161 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 1c655fb0fc08e89ab5efb23889266b710334f1a5 +Subproject commit 8dc49161bbb6aaae98522609c97803704f971569 diff --git a/qtconnectivity b/qtconnectivity index 782cbca1..6478208e 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 782cbca1dcceef80a64dd1310ea854824c54665d +Subproject commit 6478208ef9bfe24618cae383663163b894dd5e36 diff --git a/qtgamepad b/qtgamepad index 9e379c00..85d4181d 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit 9e379c00db3d5d259f4a31a755628f69e058a4ed +Subproject commit 85d4181dd9786eab1837bd50880183b38934e0ee diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 46f75ef4..936be561 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 46f75ef4912d2a677bee4b76af1de0b7f4a37f04 +Subproject commit 936be561e4b2d28b51a1c1a9dae4b7baf1f932e1 diff --git a/qtimageformats b/qtimageformats index 416cb155..4c932c40 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 416cb155b16d8ab44a4a0313ab07ee6af6913208 +Subproject commit 4c932c40349d837592c6c429fabf2511596e0fd7 diff --git a/qtnetworkauth b/qtnetworkauth index 56e67ef8..d8b2f7ab 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 56e67ef8cb06071d69d75d75b131d476a65d17cd +Subproject commit d8b2f7aba3ab58914db6fb0b5234225db1402b15 diff --git a/qtscxml b/qtscxml index 32f10df7..804fb1f9 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 32f10df75c789477091770ae01bb26643a66fd87 +Subproject commit 804fb1f97a713edc96435433d15b09a3cb670416 diff --git a/qtserialport b/qtserialport index 2e27d196..4131118d 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 2e27d1967a9a4146697028ed8feed14d0df2a46a +Subproject commit 4131118d849ef01c5a1f10ac0791088aec11b269 diff --git a/qtsvg b/qtsvg index 98a62da5..25ca9975 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 98a62da5b2dd622dd896b43c6b8a58eec0332b31 +Subproject commit 25ca99752c46e4266e6a90c31a9fb9e9fa4e5f54 diff --git a/qttools b/qttools index f46489d8..7ee63f41 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit f46489d856c347d38fac502f75370c87c83b8cee +Subproject commit 7ee63f412379f55287aa471f284f3a49f9796b60 diff --git a/qtwebsockets b/qtwebsockets index 539d5597..5fc2b148 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 539d5597491893c939c7a05ff4d45261e949e9ce +Subproject commit 5fc2b148cfa763007810d7b6256ea50d82bf7e45 diff --git a/qtx11extras b/qtx11extras index f73456e1..7540e57e 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit f73456e18e0fbe959e623c94bd1ebb23769f7e34 +Subproject commit 7540e57ea709459bd15c16d25535bb756392f923 -- cgit v1.2.3 From bdaf92aa41dc516b6bfb1282144ab24a2334cb48 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Fri, 29 Nov 2019 16:53:55 +0100 Subject: Correct branches for .gitmodules This amends eabc1ed5bd46a7882c5b98a19716e3b9aef694fa. Change-Id: Ifbcf5dc593d25d210b652b72e5563fb8e1a1ec5f Reviewed-by: Liang Qi --- .gitmodules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index a161c519..c370f18a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -188,7 +188,7 @@ recommends = qtdeclarative qtmultimedia path = qtwinextras url = ../qtwinextras.git - branch = dev + branch = wip/cmake status = addon [submodule "qtandroidextras"] depends = qtbase @@ -297,7 +297,7 @@ recommends = qtdeclarative path = qtremoteobjects url = ../qtremoteobjects.git - branch = dev + branch = wip/cmake status = addon [submodule "qtwebglplugin"] depends = qtbase qtwebsockets -- cgit v1.2.3 From 096fd23eb8586241f0cfb099324ed52970f64f2b Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 29 Nov 2019 16:56:13 +0100 Subject: Update submodules on 'wip/cmake' in qt/qt5 Change-Id: I0a261abad505b2f2724f0a15a10708b67129ffbf Reviewed-by: Qt CMake Build Bot Reviewed-by: Liang Qi --- qtremoteobjects | 2 +- qtrepotools | 2 +- qtwinextras | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/qtremoteobjects b/qtremoteobjects index a959d167..3707937c 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit a959d167858aa4708b82e7b61efc9db7243c1844 +Subproject commit 3707937ca78d21a21aecd0e671821dd4759cf385 diff --git a/qtrepotools b/qtrepotools index 0028759f..fa4ab96e 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 0028759fdab4f2a5d59b1ec3cfc34d2c992e9d94 +Subproject commit fa4ab96e757b72096b5e67fd636e128f8d8afe83 diff --git a/qtwinextras b/qtwinextras index 81694252..9e1569de 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit 816942521342e9a8c4c279fb6c759e65c8ff56be +Subproject commit 9e1569de0f68530669e56cdb78061858d2db7461 -- cgit v1.2.3 From d7a4a50e2dc936b17d9e3354b8b8a3f9f984bf25 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 2 Dec 2019 23:01:25 +0100 Subject: Update submodules on 'wip/cmake' in qt/qt5 Change-Id: Ia5837cb7f71ea98b280b66998f7a3624750dde6e Reviewed-by: Liang Qi Reviewed-by: Qt CMake Build Bot --- qtbase | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtbase b/qtbase index 8dc49161..c800a624 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 8dc49161bbb6aaae98522609c97803704f971569 +Subproject commit c800a6240353eb54bd7a2ad06c455ac9374c2476 -- cgit v1.2.3 From 8c94279a5957cbe517f14ed03b342092f23bafc3 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Tue, 3 Dec 2019 14:46:21 +0100 Subject: Update submodules on 'wip/cmake' in qt/qt5 Change-Id: Id725f04bc4753fc68a9bbb2762beb2c5f4eb9d84 Reviewed-by: Qt CMake Build Bot Reviewed-by: Liang Qi --- qtbase | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtbase b/qtbase index c800a624..715465a9 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit c800a6240353eb54bd7a2ad06c455ac9374c2476 +Subproject commit 715465a93b1d1ec1f290821db88adeb705cf57f8 -- cgit v1.2.3 From ec79fbe5ec44600d5bbfab6da029244d12b933dc Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 4 Dec 2019 07:23:31 +0100 Subject: Update submodules on 'wip/cmake' in qt/qt5 Change-Id: I45dd7a0b0a93a35aa3f528617efeaa2859f9ce6e Reviewed-by: Qt CMake Build Bot Reviewed-by: Liang Qi --- qtbase | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtbase b/qtbase index 715465a9..9eea24ed 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 715465a93b1d1ec1f290821db88adeb705cf57f8 +Subproject commit 9eea24ed601d0aa243269fac64c9a65c3750d1b0 -- cgit v1.2.3 From f38665a06a045ff9f585da196c6d8fa53eea3af2 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 6 Dec 2019 23:01:41 +0100 Subject: Update submodules on 'wip/cmake' in qt/qt5 Change-Id: I0c29a5b3944a20d6652c0c8cb1199abae9683f93 Reviewed-by: Qt CMake Build Bot Reviewed-by: Liang Qi --- qtbase | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtbase b/qtbase index 9eea24ed..a64acbea 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 9eea24ed601d0aa243269fac64c9a65c3750d1b0 +Subproject commit a64acbea9cf033d4c1503f50d3563ebfc76f5bba -- cgit v1.2.3 From d47213e974feaedaa4a793974875b28ff65d8ab1 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 9 Dec 2019 23:02:03 +0100 Subject: Update submodules on 'wip/cmake' in qt/qt5 Change-Id: I8a50e284b785b7441826ed4f199a5db4c2be6f6e Reviewed-by: Qt CMake Build Bot Reviewed-by: Liang Qi --- qtbase | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtbase b/qtbase index a64acbea..ea9c2e55 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit a64acbea9cf033d4c1503f50d3563ebfc76f5bba +Subproject commit ea9c2e558c202069b1358f5801808d0adb29dbc7 -- cgit v1.2.3 From bbe2ca1f1452910290de615b06be28127e48f1e1 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 10 Dec 2019 23:01:46 +0100 Subject: Update submodules on 'wip/cmake' in qt/qt5 Change-Id: Ia8dbab68e5a7dd4f136e6345d6c1da9705d4be69 Reviewed-by: Qt CMake Build Bot Reviewed-by: Liang Qi --- qtbase | 2 +- qttools | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qtbase b/qtbase index ea9c2e55..6c20ae77 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit ea9c2e558c202069b1358f5801808d0adb29dbc7 +Subproject commit 6c20ae774cda49fc233125768b806447669f4265 diff --git a/qttools b/qttools index 7ee63f41..09367658 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 7ee63f412379f55287aa471f284f3a49f9796b60 +Subproject commit 0936765801ec9ad4710e94ea788515e498315bd7 -- cgit v1.2.3 From 3aef26846488f98110cb322ac6e9dda43649e993 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Thu, 5 Dec 2019 17:15:12 +0100 Subject: Update vcpkg snapshot The snapshot uses the previous snapshot as a based. It was rebased on latest master as of 2019-12-05, and also contains cherry-picked patches to target iOS. Change-Id: I9fc0c39856fdb255533f6c71d27f5749894b6bea Reviewed-by: Qt CMake Build Bot Reviewed-by: Simon Hausmann --- coin/provisioning/common/shared/vcpkg_version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/provisioning/common/shared/vcpkg_version.txt b/coin/provisioning/common/shared/vcpkg_version.txt index 993101eb..7bff414a 100644 --- a/coin/provisioning/common/shared/vcpkg_version.txt +++ b/coin/provisioning/common/shared/vcpkg_version.txt @@ -1 +1 @@ -vcpkg_version=qt-snapshot-2019-10-09 +vcpkg_version=qt-snapshot-2019-12-05 -- cgit v1.2.3