aboutsummaryrefslogtreecommitdiffstats
path: root/coin
diff options
context:
space:
mode:
authorTony Sarajärvi <tony.sarajarvi@qt.io>2018-09-18 14:40:35 +0300
committerLiang Qi <liang.qi@qt.io>2018-09-24 17:13:22 +0000
commita620807118a2d4566fbb04b5d90b85f8f0a41a59 (patch)
treeafd5f668bef8954c760ef088b90352887f9420fc /coin
parentf1256e1f391fb9b229a246baff17f2562a82df20 (diff)
Move QNX770 from macOS 10.12 to macOS 10.13
Change-Id: I02f0fff983349dd59f2697a050b97b761d04d3b5 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Diffstat (limited to 'coin')
-rw-r--r--coin/platform_configs/qt5.txt2
-rwxr-xr-xcoin/provisioning/qtci-macos-10.12-x86_64/40-qnx700.sh57
2 files changed, 1 insertions, 58 deletions
diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt
index 984844be..f074aea7 100644
--- a/coin/platform_configs/qt5.txt
+++ b/coin/platform_configs/qt5.txt
@@ -12,7 +12,7 @@ qtci-windows-7-x86-3 Android_ANY armv7 Mingw73 Clang
qtci-windows-7-x86-3 Android_ANY x86 Mingw73 Clang Packaging Release DisableTests OpenGLES2
qtci-macos-10.13-x86_64 Android_ANY armv7 Clang Clang Packaging Release DisableTests OpenGLES2
qtci-macos-10.13-x86_64 Android_ANY x86 Clang Clang Packaging Release DisableTests OpenGLES2
-qtci-macos-10.12-x86_64-8 QNX_700 x86 GCC Release DisableTests OpenGLES2 NoUseGoldLinker
+qtci-macos-10.13-x86_64 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
diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/40-qnx700.sh b/coin/provisioning/qtci-macos-10.12-x86_64/40-qnx700.sh
deleted file mode 100755
index 38fb6103..00000000
--- a/coin/provisioning/qtci-macos-10.12-x86_64/40-qnx700.sh
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/bin/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 QNX 7.
-
-targetFolder="/opt/"
-sourceFile="/net/ci-files01-hki.intra.qt.io/hdd/www/input/qnx/qnx700-20180801-macos.zip"
-folderName="qnx700"
-
-sudo mkdir -p "$targetFolder"
-
-echo "Extracting QNX 7"
-sudo unzip -q "$sourceFile" -d "$targetFolder"
-
-sudo chown -R qt:wheel "$targetFolder"/"$folderName"
-
-# Verify that we have last file in zip
-if [ ! -f $targetFolder/$folderName/qnxsdp-env.sh ]; then
- exit 1
-fi
-
-# Set env variables
-echo "export QNX_700=$targetFolder/$folderName" >> ~/.bashrc
-echo "QNX SDP = 7.0.0" >> ~/versions.txt
-