diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2014-09-16 15:17:21 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2014-09-16 15:17:21 +0200 |
| commit | 914adeab82d228773def64c9c304d1e15bab0b52 (patch) | |
| tree | 9ab0f8e7b09d62b77ffc5450d9e883a89d69fd88 /scripts | |
| parent | 11f89ece8de7763f811d2fe1e45cb27ad4a77519 (diff) | |
| parent | a4db6db358aefb60bac34cacbab23aa6f38279f7 (diff) | |
| download | qt-creator-914adeab82d228773def64c9c304d1e15bab0b52.tar.gz | |
Merge remote-tracking branch 'origin/3.2'
Conflicts:
src/plugins/qmldesigner/designercore/model/plaintexteditmodifier.cpp
src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
Change-Id: I1627f6aa98a442413f8b08b579ecaf9647dc887b
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/deployqtHelper_mac.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/deployqtHelper_mac.sh b/scripts/deployqtHelper_mac.sh index d8e729c787..f6168fac8e 100755 --- a/scripts/deployqtHelper_mac.sh +++ b/scripts/deployqtHelper_mac.sh @@ -24,12 +24,12 @@ if [ -d "$5" ]; then fi qmlpuppetapp="$1/Contents/MacOS/qmlpuppet" -if [ -d "$qmlpuppetapp" ]; then +if [ -f "$qmlpuppetapp" ]; then qmlpuppetArgument="-executable=$qmlpuppetapp" fi qml2puppetapp="$1/Contents/MacOS/qml2puppet" -if [ -d "$qml2puppetapp" ]; then +if [ -f "$qml2puppetapp" ]; then qml2puppetArgument="-executable=$qml2puppetapp" fi |