From 2c775f28e0ea1ea6b6e5768f01964ad074b60289 Mon Sep 17 00:00:00 2001 From: Oleg Korshul Date: Fri, 21 Jun 2019 13:57:28 +0300 Subject: [PATCH] developing --- scripts/build_js.pro | 2 +- scripts/deploy.pro | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/scripts/build_js.pro b/scripts/build_js.pro index e44fbb2..d38986f 100644 --- a/scripts/build_js.pro +++ b/scripts/build_js.pro @@ -57,7 +57,7 @@ desktop { copyFile($$ROOT_GIT_DIR/web-apps-pro/apps/api/documents/index.html.desktop, $$CUR_ROOT/web-apps/apps/api/documents/index.html) - runNPM2($$ROOT_GIT_DIR/desktop-apps/common/loginpage/build) + runNPM($$ROOT_GIT_DIR/desktop-apps/common/loginpage/build) gruntInterface($$ROOT_GIT_DIR/desktop-apps/common/loginpage/build) copyFile($$ROOT_GIT_DIR/desktop-apps/common/loginpage/deploy/index.html, $$CUR_ROOT/index.html) diff --git a/scripts/deploy.pro b/scripts/deploy.pro index 0084416..8dfdd39 100644 --- a/scripts/deploy.pro +++ b/scripts/deploy.pro @@ -129,6 +129,12 @@ desktop { copyQtLib(Qt5Network, $$CUR_ROOT) copyQtLib(Qt5OpenGL, $$CUR_ROOT) + core_linux { + system(cp -f -av "$$QT_CURRENT/../lib/libicui18n*" $$shell_quote($$CUR_ROOT/) $$escape_expand(\\n\\t)) + system(cp -f -av "$$QT_CURRENT/../lib/libicuuc*" $$shell_quote($$CUR_ROOT/) $$escape_expand(\\n\\t)) + system(cp -f -av "$$QT_CURRENT/../lib/libicudata*" $$shell_quote($$CUR_ROOT/) $$escape_expand(\\n\\t)) + } + copyLib($$ROOT_GIT_DIR/core/build/lib/$$OS_CURRENT, $$CUR_ROOT, hunspell) copyLib($$ROOT_GIT_DIR/core/build/lib/$$OS_CURRENT, $$CUR_ROOT, ooxmlsignature)