From c33f28bc0593e5b3f16848d4eed4790aa45de0c2 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 26 Apr 2017 20:11:25 +0200 Subject: Update submodules on '5.6' in qt5 Change-Id: Iadc5070366d65f98c81af02f4926c2ebfb1ae294 Reviewed-by: Liang Qi --- qtdeclarative | 2 +- qttools | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qtdeclarative b/qtdeclarative index f76dd50d..2da8e40f 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit f76dd50d42b91234dcb7c0ea0775382e369f11ae +Subproject commit 2da8e40fe22396eec158c160ac75ab23d4a0abd8 diff --git a/qttools b/qttools index 64e99958..a4f65612 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 64e99958f358003092cdf455eec89c08cf3b6fd1 +Subproject commit a4f656126803b6cfac8ac4b442ee975562145b73 -- cgit v1.2.3 From 2715a17c9bbe35738549fcb9fec92ad965fae072 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 8 Dec 2016 15:46:06 +0100 Subject: get rid of custom 'qt' gitmodules property MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit instead, re-use the (also custom) 'project' property with the magic value '-' to flag modules which contain no project files at all. Change-Id: I33163c098852e1b79ad698115aac98217efe1157 Reviewed-by: Frederik Gladhorn Reviewed-by: Jędrzej Nowacki Reviewed-by: Joerg Bornemann Reviewed-by: Aapo Keskimolo Reviewed-by: Eike Ziller Reviewed-by: Iikka Eklund Reviewed-by: Jake Petroules --- .gitmodules | 2 +- qt.pro | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index b4d74220..9e391985 100644 --- a/.gitmodules +++ b/.gitmodules @@ -68,7 +68,7 @@ url = ../qtrepotools.git branch = master status = essential - qt = false + project = - [submodule "qtwebkit"] depends = qtbase recommends = qtdeclarative qtlocation qtmultimedia qtsensors qtwebchannel qtxmlpatterns diff --git a/qt.pro b/qt.pro index bf510fab..825e6b51 100644 --- a/qt.pro +++ b/qt.pro @@ -29,7 +29,8 @@ QMAKE_INTERNAL_INCLUDED_FILES += $$PWD/.gitmodules modules = $$sort_depends(modules, module., .depends .recommends .serialize) modules = $$reverse(modules) for (mod, modules) { - equals(module.$${mod}.qt, false): \ + project = $$eval(module.$${mod}.project) + equals(project, -): \ next() deps = $$eval(module.$${mod}.depends) @@ -43,7 +44,6 @@ for (mod, modules) { !isEmpty(QT_BUILD_MODULES):!contains(QT_BUILD_MODULES, $$mod): \ next() - project = $$eval(module.$${mod}.project) isEmpty(project) { !exists($$mod/$${mod}.pro): \ next() -- cgit v1.2.3 From a4a7f71f37843d6f0809855ba443541faa3cdc87 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Tue, 2 May 2017 21:25:34 +0300 Subject: MSVC 2017 updated and missing component for winrt arm MSVC 2017 and Build Tools updated to version 15.1. Also missing component 'Visual C++ compilers and libraries for ARM' installed for winrt arm Also script added to storage msvc version numbers to versions.txt Change-Id: I015e15d5d613b178c1266a2aecee5c3270780486 Reviewed-by: Simon Hausmann --- coin/platform_configs/default.txt | 4 +- coin/platform_configs/qt5.txt | 6 +-- .../qtci-windows-10-x86/msvc2017.ps1 | 2 +- .../qtci-windows-10-x86_64/msvc2017.ps1 | 2 +- coin/provisioning/qtci-windows-10-x86/msvc.ps1 | 43 ++++++++++++++++++++++ coin/provisioning/qtci-windows-10-x86_64/msvc.ps1 | 43 ++++++++++++++++++++++ 6 files changed, 93 insertions(+), 7 deletions(-) create mode 100644 coin/provisioning/qtci-windows-10-x86/msvc.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/msvc.ps1 diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index 917a8323..4ac819c4 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -6,8 +6,8 @@ qtci-windows-8-x86-2 MSVC2013 qtci-windows-8-x86_64-2 MSVC2013 Packaging DebugAndRelease Release OpenGLDynamic qtci-windows-7-x86-2 MSVC2010 Release DeveloperBuild QtNamespace QtLibInfix OpenGLDynamic qtci-windows-7-x86-2 Mingw49 Packaging DebugAndRelease Release OpenGLDynamic -qtci-windows-10-x86-5 MSVC2015 Packaging DebugAndRelease Release OpenGLDynamic -qtci-windows-10-x86_64-6 MSVC2015 Packaging DebugAndRelease Release OpenGLDynamic +qtci-windows-10-x86-6 MSVC2015 Packaging DebugAndRelease Release OpenGLDynamic +qtci-windows-10-x86_64-7 MSVC2015 Packaging DebugAndRelease Release OpenGLDynamic qtci-windows-8-x86_64-2 Windows_Phone_8_1 armv4 MSVC2013 Packaging DebugAndRelease Release DisableTests qtci-windows-8-x86_64-2 WinRT_8_1 MSVC2013 Packaging DebugAndRelease Release DisableTests qtci-linux-Ubuntu-14.04-x86_64 GCC NoWidgets ForceDebugInfo diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt index 77e98693..77668039 100644 --- a/coin/platform_configs/qt5.txt +++ b/coin/platform_configs/qt5.txt @@ -1,8 +1,8 @@ Template Target OS Target arch Compiler Features --------------------------- ------------------- ----------- ----------- ----------------------------------------------------------------------------------------------- qtci-windows-8-x86_64-2 Windows_Phone_8_1 x86 MSVC2013 Packaging DebugAndRelease Release DisableTests -qtci-windows-10-x86_64-6 WinRT_10 x86 MSVC2015 Packaging DebugAndRelease Release DisableTests -qtci-windows-10-x86_64-6 WinRT_10 MSVC2015 Packaging DebugAndRelease Release DisableTests +qtci-windows-10-x86_64-7 WinRT_10 x86 MSVC2015 Packaging DebugAndRelease Release DisableTests +qtci-windows-10-x86_64-7 WinRT_10 MSVC2015 Packaging DebugAndRelease Release DisableTests qtci-linux-RHEL-6.6-x86_64 Android_ANY x86 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker qtci-windows-7-x86-2 Android_ANY armv7 Mingw49 Packaging Release DisableTests OpenGLES2 qtci-windows-7-x86-2 Android_ANY x86 Mingw49 Packaging Release DisableTests OpenGLES2 @@ -12,6 +12,6 @@ qtci-linux-RHEL-6.6-x86_64 QNX_660 x86 GCC Packagin qtci-windows-7-x86-2 QNX_660 armv7 Mingw49 Packaging Release DisableTests OpenGLES2 qtci-windows-7-x86-2 QNX_660 x86 Mingw49 Packaging Release DisableTests OpenGLES2 # target arch is used here only for documentation the value is ignored -qtci-windows-10-x86_64-6 WinRT_10 armv7 MSVC2015 Packaging DebugAndRelease Release DisableTests +qtci-windows-10-x86_64-7 WinRT_10 armv7 MSVC2015 Packaging DebugAndRelease Release DisableTests qtci-osx-10.11-x86_64 IOS_ANY multi Clang Packaging DebugAndRelease DisableTests Static diff --git a/coin/pre-provisioning/qtci-windows-10-x86/msvc2017.ps1 b/coin/pre-provisioning/qtci-windows-10-x86/msvc2017.ps1 index 46675c23..01442324 100644 --- a/coin/pre-provisioning/qtci-windows-10-x86/msvc2017.ps1 +++ b/coin/pre-provisioning/qtci-windows-10-x86/msvc2017.ps1 @@ -43,7 +43,7 @@ $msvcPackage = "C:\Windows\Temp\$version.exe" Download $url_cache $url_cache $msvcPackage Verify-Checksum $msvcPackage $sha1 -cmd /c "$msvcPackage --all --norestart --quiet --wait" +cmd /c "$msvcPackage --all --norestart --quiet --wait --add Microsoft.VisualStudio.Component.VC.Tools.ARM" echo "Cleaning $msvcPackage.." Remove-Item -Recurse -Force "$msvcPackage" echo "Visual Studio = $version" >> ~\versions.txt diff --git a/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2017.ps1 b/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2017.ps1 index 46675c23..01442324 100644 --- a/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2017.ps1 +++ b/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2017.ps1 @@ -43,7 +43,7 @@ $msvcPackage = "C:\Windows\Temp\$version.exe" Download $url_cache $url_cache $msvcPackage Verify-Checksum $msvcPackage $sha1 -cmd /c "$msvcPackage --all --norestart --quiet --wait" +cmd /c "$msvcPackage --all --norestart --quiet --wait --add Microsoft.VisualStudio.Component.VC.Tools.ARM" echo "Cleaning $msvcPackage.." Remove-Item -Recurse -Force "$msvcPackage" echo "Visual Studio = $version" >> ~\versions.txt diff --git a/coin/provisioning/qtci-windows-10-x86/msvc.ps1 b/coin/provisioning/qtci-windows-10-x86/msvc.ps1 new file mode 100644 index 00000000..1de57a66 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/msvc.ps1 @@ -0,0 +1,43 @@ +############################################################################# +## +## 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$ +## +############################################################################# + +# Visual Studios are pre-provisioned to tier1 images + +# MSVC 2015 Update 3 +echo "Visual Studio 2015 = Version 14.0.25421.3 Update 3" >> ~\versions.txt + +# MSVC 2017 +echo "Visual Studio 2017 = Version 15.1 (26403.7)" >> ~\versions.txt + +# MSVC 2017 Build Tools +echo "Visual Studio 2017 Build Tools = Version 15.1 (26403.7)" >> ~\versions.txt diff --git a/coin/provisioning/qtci-windows-10-x86_64/msvc.ps1 b/coin/provisioning/qtci-windows-10-x86_64/msvc.ps1 new file mode 100644 index 00000000..1de57a66 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/msvc.ps1 @@ -0,0 +1,43 @@ +############################################################################# +## +## 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$ +## +############################################################################# + +# Visual Studios are pre-provisioned to tier1 images + +# MSVC 2015 Update 3 +echo "Visual Studio 2015 = Version 14.0.25421.3 Update 3" >> ~\versions.txt + +# MSVC 2017 +echo "Visual Studio 2017 = Version 15.1 (26403.7)" >> ~\versions.txt + +# MSVC 2017 Build Tools +echo "Visual Studio 2017 Build Tools = Version 15.1 (26403.7)" >> ~\versions.txt -- cgit v1.2.3