From ee20f27b46bd582c38de49e6da20f4e7971a9868 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simo=20F=C3=A4lt?= <simo.falt@qt.io>
Date: Wed, 24 Jan 2018 11:39:50 +0200
Subject: [PATCH] Partially revert "Use vanilla OS X 10.11"

This partially reverts beecc6e86e1e8b9aaf4c9029c36e53a94c01a957
but also amends the script, which is not working with
vanilla template. We need the virtualenv fix for pyside.

Change-Id: I12c5f7a7399bd92729e81a1d2a35bceb990261ae
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
---
 .../004-fix-virtualenv.sh                     | 55 +++++++++++++++++++
 1 file changed, 55 insertions(+)
 create mode 100755 coin/provisioning/qtci-osx-10.11-x86_64/004-fix-virtualenv.sh

diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/004-fix-virtualenv.sh b/coin/provisioning/qtci-osx-10.11-x86_64/004-fix-virtualenv.sh
new file mode 100755
index 00000000..33f66ebf
--- /dev/null
+++ b/coin/provisioning/qtci-osx-10.11-x86_64/004-fix-virtualenv.sh
@@ -0,0 +1,55 @@
+#!/usr/bin/env bash
+set -e
+#############################################################################
+##
+## Copyright (C) 2018 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$
+##
+#############################################################################
+source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh"
+# macOS 10.11 template doesn't have working virtualenv installation.
+# To fix that, we first have to install pip to install virtualenv
+# Install pip
+urlCache="http://ci-files01-hki.intra.qt.io/input/utils/get-pip.py"
+urlAlt="https://bootstrap.pypa.io/get-pip.py"
+sha1="3d45cef22b043b2b333baa63abaa99544e9c031d"
+DownloadURL $urlCache $urlAlt $sha1 get-pip.py
+
+sudo python get-pip.py
+rm get-pip.py
+
+# remove possible link pointing to broken virtualenv
+sudo rm -f /opt/local/bin/virtualenv
+sudo pip install virtualenv
+
+# make sure it is now in PATH
+which virtualenv
+if [[ $? -ne 0 ]]; then
+    exit 1
+fi