Commit 455d597a authored by Eike Ziller's avatar Eike Ziller
Browse files

Fix deploying Qt on Mac (qt quick imports)



Since we are using Qt Quick 2 now, Qt Creator also needs to find the Qt
Quick 2 imports.
Also make qmlpuppet (Qt Quick 1) optional for deploying Qt.

Task-number: QTBUG-33545

Change-Id: I296e4b3a1827f7b26841e94e15eda718afef81d0
Reviewed-by: default avatarTim Jenssen <tim.jenssen@digia.com>
parent 696b0a8b
[Paths]
Imports = Imports/qtquick1
Qml2Imports = Imports/qtquick2
Plugins = PlugIns
......@@ -23,6 +23,14 @@ if [ -d "$5" ]; then
cp -R "$5"/ "$imports2Dir"/
fi
qmlpuppetapp="$1/Contents/MacOS/qmlpuppet.app"
if [ -d "$qmlpuppetapp" ]; then
qmlpuppetArgument="-executable=$qmlpuppetapp/Contents/MacOS/qmlpuppet"
qmlpuppetResources="$1/Contents/MacOS/qmlpuppet.app/Contents/Resources"
test -d "$qmlpuppetResources" || mkdir -p "$qmlpuppetResources"
cp "$(dirname "${BASH_SOURCE[0]}")/../dist/installer/mac/qmlpuppet_qt.conf" "$qmlpuppetResources/qt.conf" || exit 1
fi
qml2puppetapp="$1/Contents/MacOS/qml2puppet.app"
if [ -d "$qml2puppetapp" ]; then
qml2puppetArgument="-executable=$qml2puppetapp/Contents/MacOS/qml2puppet"
......@@ -32,13 +40,11 @@ if [ -d "$qml2puppetapp" ]; then
fi
macdeployqt "$1" \
"-executable=$1/Contents/MacOS/qmlpuppet.app/Contents/MacOS/qmlpuppet" \
"-executable=$1/Contents/Resources/qtpromaker" \
"-executable=$1/Contents/Resources/sdktool" "$qml2puppetArgument" || exit 1
"-executable=$1/Contents/Resources/sdktool" "$qmlpuppetArgument" "$qml2puppetArgument" || exit 1
qmlpuppetResources="$1/Contents/MacOS/qmlpuppet.app/Contents/Resources"
test -d "$qmlpuppetResources" || mkdir -p "$qmlpuppetResources"
cp "$(dirname "${BASH_SOURCE[0]}")/../dist/installer/mac/qmlpuppet_qt.conf" "$qmlpuppetResources/qt.conf" || exit 1
# copy qt creator qt.conf
cp -f "$(dirname "${BASH_SOURCE[0]}")/../dist/installer/mac/qt.conf" "$1/Contents/Resources/qt.conf" || exit 1
# copy Qt translations
cp "$2"/*.qm "$1/Contents/Resources/translations/" || exit 1
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment