diff options
| author | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-07-10 14:30:04 +0200 |
|---|---|---|
| committer | Tim Jenssen <tim.jenssen@theqtcompany.com> | 2015-07-14 10:02:01 +0000 |
| commit | 447f42d0e217f05c5122d3f65e0e5b8f88f55449 (patch) | |
| tree | 2f5f1b78fdd94e7e3af15ed6a4bece793cbe46de /scripts | |
| parent | 4816ad212590d15ae32099eaa21975bf61eb214b (diff) | |
| download | qt-creator-447f42d0e217f05c5122d3f65e0e5b8f88f55449.tar.gz | |
OS X: There is no qml(1)puppet anymore, so don't try to deploy it
Change-Id: Ic3f3150e3295529082ca621ec27792b2d08caed1
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/deployqtHelper_mac.sh | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/scripts/deployqtHelper_mac.sh b/scripts/deployqtHelper_mac.sh index be7929a5ff..8ac00fbab3 100755 --- a/scripts/deployqtHelper_mac.sh +++ b/scripts/deployqtHelper_mac.sh @@ -82,11 +82,6 @@ fi if [ ! -d "$1/Contents/Frameworks/QtCore.framework" ]; then - qmlpuppetapp="$1/Contents/MacOS/qmlpuppet" - if [ -f "$qmlpuppetapp" ]; then - qmlpuppetArgument="-executable=$qmlpuppetapp" - fi - qml2puppetapp="$1/Contents/MacOS/qml2puppet" if [ -f "$qml2puppetapp" ]; then qml2puppetArgument="-executable=$qml2puppetapp" @@ -111,6 +106,6 @@ if [ ! -d "$1/Contents/Frameworks/QtCore.framework" ]; then "-executable=$qbsapp-setup-android" \ "-executable=$qbsapp-setup-qt" \ "-executable=$qbsapp-setup-toolchains" \ - "$qmlpuppetArgument" "$qml2puppetArgument" "$clangbackendArgument" || exit 1 + "$qml2puppetArgument" "$clangbackendArgument" || exit 1 fi |