diff options
| author | Ilya Zverev <zverik@textual.ru> | 2017-03-28 16:42:38 +0300 |
|---|---|---|
| committer | Ilya Zverev <ilya@zverev.info> | 2017-07-04 11:26:12 +0300 |
| commit | accc48d7b86be276efa07c2a7ee33bd72e66cd56 (patch) | |
| tree | 528bcc0d2e0c6eccdfd0bb7548f49b7dc427ddaf /tools | |
| parent | 62f00454abe7f1f8cf51c0893206ee649e555508 (diff) | |
MacDeployQtFix until we use Qt 5.10
Diffstat (limited to 'tools')
| m--------- | tools/macdeployqtfix | 0 | ||||
| -rwxr-xr-x | tools/unix/build_designer.sh | 2 |
2 files changed, 2 insertions, 0 deletions
diff --git a/tools/macdeployqtfix b/tools/macdeployqtfix new file mode 160000 +Subproject c2fa2720f627236d031819c7d6ba33ee6cedbf1 diff --git a/tools/unix/build_designer.sh b/tools/unix/build_designer.sh index adc80be595..c5d4462a71 100755 --- a/tools/unix/build_designer.sh +++ b/tools/unix/build_designer.sh @@ -30,6 +30,8 @@ rm -rf "$RELEASE_PATH" # Prepare app package by copying Qt, Kothic, Skin Generator, Style tests for i in skin_generator style_tests generator_tool MAPS.ME.Designer; do "$(dirname "$QMAKE")/macdeployqt" "$RELEASE_PATH/$i.app" + [ -z "${QTPATH-}" ] && QTPATH="$(otool -L "$RELEASE_PATH/$i.app/Contents/Frameworks/QtGui.framework/QtGui" | grep QtCore | sed -e 's/^[[:space:]]*\(.*\)lib\/QtCore.framework.*$/\1/')" + python "$OMIM_PATH/tools/macdeployqtfix/macdeployqtfix.py" -q -nl "$RELEASE_PATH/$i.app/Contents/MacOS/$i" "$QTPATH" done MAC_RESOURCES="$RELEASE_PATH/MAPS.ME.Designer.app/Contents/Resources" |