aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorItalocoin Project <12392580+italocoin-project@users.noreply.github.com>2020-08-23 15:28:12 +0200
committerilie1988 <info@italo.network>2020-08-26 20:16:34 +0200
commitf51b0f67047bae0f383b0f54dc3c2647876e284d (patch)
tree5bb9fb57a0a019cbcb71b1a728094f7829347cc0
parente65159163d91a4d5f5f0159c989108880e652670 (diff)
downloadmonzero-gui-f51b0f67047bae0f383b0f54dc3c2647876e284d.tar.gz
monzero-gui-f51b0f67047bae0f383b0f54dc3c2647876e284d.tar.xz
monzero-gui-f51b0f67047bae0f383b0f54dc3c2647876e284d.zip
fix windows deploy with QT 5.14+
this is a workaround on QT 5.14+ errors on mingw fixes issue https://github.com/monero-project/monero-gui/issues/3041
-rw-r--r--monero-wallet-gui.pro2
-rw-r--r--windeploy_helper.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/monero-wallet-gui.pro b/monero-wallet-gui.pro
index c0285f60..27178623 100644
--- a/monero-wallet-gui.pro
+++ b/monero-wallet-gui.pro
@@ -541,7 +541,7 @@ macx {
}
win32 {
- deploy.commands += windeployqt $$sprintf("%1/%2/%3.exe", $$OUT_PWD, $$DESTDIR, $$TARGET) -release -no-translations -qmldir=$$PWD
+ deploy.commands += windeployqt $$sprintf("%1/%2/%3.exe", $$OUT_PWD, $$DESTDIR, $$TARGET) -no-translations -qmldir=$$PWD
# Win64 msys2 deploy settings
contains(QMAKE_HOST.arch, x86_64) {
deploy.commands += $$escape_expand(\n\t) $$PWD/windeploy_helper.sh $$DESTDIR
diff --git a/windeploy_helper.sh b/windeploy_helper.sh
index 12b0ccd0..507f85c8 100644
--- a/windeploy_helper.sh
+++ b/windeploy_helper.sh
@@ -23,7 +23,7 @@ else
ICU_FILES=(libicudtd67.dll libicuind67.dll libicuiod67.dll libicutud67.dll libicuucd67.dll)
fi
-FILES=(libprotobuf.dll libusb-1.0.dll zlib1.dll libzstd.dll libwinpthread-1.dll libtiff-5.dll libstdc++-6.dll libpng16-16.dll libpcre16-0.dll libpcre-1.dll libmng-2.dll liblzma-5.dll liblcms2-2.dll libjpeg-8.dll libintl-8.dll libiconv-2.dll libharfbuzz-0.dll libgraphite2.dll libglib-2.0-0.dll libfreetype-6.dll libbz2-1.dll libssp-0.dll libpcre2-16-0.dll libhidapi-0.dll libdouble-conversion.dll libgcrypt-20.dll)
+FILES=(libprotobuf.dll libbrotlicommon.dll libbrotlidec.dll libusb-1.0.dll zlib1.dll libzstd.dll libwinpthread-1.dll libtiff-5.dll libstdc++-6.dll libpng16-16.dll libpcre16-0.dll libpcre-1.dll libmng-2.dll liblzma-5.dll liblcms2-2.dll libjpeg-8.dll libintl-8.dll libiconv-2.dll libharfbuzz-0.dll libgraphite2.dll libglib-2.0-0.dll libfreetype-6.dll libbz2-1.dll libssp-0.dll libpcre2-16-0.dll libhidapi-0.dll libdouble-conversion.dll libgcrypt-20.dll)
OPENSSL_FILES=(libssl-1_1 libcrypto-1_1)