diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2020-09-07 14:43:32 -0500 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2020-09-07 14:43:32 -0500 |
| commit | a8eab144e4b5e0a1550595ac44cd8ec0b9d5fa48 (patch) | |
| tree | 70925a472bbe12492a5b43f096213be6f6db106d | |
| parent | 83cffa469e600fcf612ed71599adc852b8aaf845 (diff) | |
| parent | f51b0f67047bae0f383b0f54dc3c2647876e284d (diff) | |
| download | monzero-gui-a8eab144e4b5e0a1550595ac44cd8ec0b9d5fa48.tar.gz monzero-gui-a8eab144e4b5e0a1550595ac44cd8ec0b9d5fa48.tar.xz monzero-gui-a8eab144e4b5e0a1550595ac44cd8ec0b9d5fa48.zip | |
Merge pull request #3047
f51b0f6 fix windows deploy with QT 5.14+ (italocoin-project)
| -rw-r--r-- | monero-wallet-gui.pro | 2 | ||||
| -rw-r--r-- | windeploy_helper.sh | 2 |
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) |