From 967a2409f360736781da7b32baa4ae211a84cf80 Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Tue, 28 Apr 2020 10:07:07 +0200 Subject: [PATCH] Use cloud Qt. --- pri/install.pri | 19 +------------------ resources/scripts/.appveyor-build-win.ps1 | 5 ++++- 2 files changed, 5 insertions(+), 19 deletions(-) diff --git a/pri/install.pri b/pri/install.pri index a987e3704..3aa624478 100644 --- a/pri/install.pri +++ b/pri/install.pri @@ -175,25 +175,8 @@ win32 { lib.path = $$PREFIX lib.CONFIG = no_check_exist - qt_dlls_root.files = ../../resources/binaries/windows/qt5-msvc2017/*.* - qt_dlls_root.path = $$quote($$PREFIX/) + INSTALLS += target lib - qt_dlls_plugins.files = ../../resources/binaries/windows/qt5-msvc2017/* - qt_dlls_plugins.path = $$quote($$PREFIX/) - - INSTALLS += target lib qt_dlls_root qt_dlls_plugins - - equals(USE_WEBENGINE, true) { - # Copy extra resource files for QtWebEngine. - qtwebengine_dlls.files = ../../resources/binaries/windows/qt5-msvc2017-webengine/* - qtwebengine_dlls.path = $$quote($$PREFIX/) - - qtwebengine.files = ../../resources/binaries/windows/qt5-msvc2017-webengine/*.* - qtwebengine.path = $$quote($$PREFIX/) - - INSTALLS += qtwebengine_dlls qtwebengine - } - INSTALL_HEADERS_PREFIX = $$quote($$PREFIX/include/librssguard/) } diff --git a/resources/scripts/.appveyor-build-win.ps1 b/resources/scripts/.appveyor-build-win.ps1 index 79a20ea6e..87d6dc1a3 100644 --- a/resources/scripts/.appveyor-build-win.ps1 +++ b/resources/scripts/.appveyor-build-win.ps1 @@ -11,7 +11,10 @@ mkdir "rssguard-build" cd "rssguard-build" qmake.exe ..\build.pro "$env:qmake_args" nmake.exe +nmake.exe install -cd "src\rssguard" +cd "src\rssguard\app" +"$env:QTDIR\bin\windeployqt.exe" --verbose 1 --compiler-runtime --no-translations --release rssguard.exe librssguard.dll +cd ".." nmake.exe windows_all cd "$old_pwd" \ No newline at end of file