From c77ded94cae345fe9a35188fa7a87aaf81fe5b8f Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Tue, 28 Apr 2020 12:42:34 +0200 Subject: [PATCH] Fix artifacts. --- resources/scripts/.appveyor-build-win.ps1 | 25 +++++++++++++++++++++-- src/librssguard/gui/dialogs/formabout.cpp | 2 +- 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/resources/scripts/.appveyor-build-win.ps1 b/resources/scripts/.appveyor-build-win.ps1 index abbb07ce7..55faff8b2 100644 --- a/resources/scripts/.appveyor-build-win.ps1 +++ b/resources/scripts/.appveyor-build-win.ps1 @@ -1,9 +1,10 @@ # List startup folder. $old_pwd=$pwd.Path $ssl_bin = "C:\OpenSSL-v111-Win64\bin" +$mysql_dir = "C:\Program Files\MySQL\MySQL Server 5.7" ls "$ssl_bin" -ls "C:\Program Files\MySQL\MySQL Server 5.7\lib" +ls "$mysql_dir\lib" ls "$env:QTDIR" ls "$env:QTDIR\.." @@ -14,6 +15,25 @@ echo "Qmake args are: '$env:qmake_args'." # Setup env path with qmake. $env:PATH = "$env:QTDIR\bin;" + $env:PATH +# Build MySQL Qt plugin. +$qt_ver = "5.14" +$qt_rev = "2" +$qtbase_url = "https://download.qt.io/archive/qt/$qt_ver/$qt_ver.$qt_rev/submodules/qtbase-everywhere-src-$qt_ver.$qt_rev.zip" +$output = "qt.zip" + +mkdir "build-mysql" +cd "build-mysql" + +Invoke-WebRequest -Uri $qtbase_url -OutFile $output + +& "..\resources\scripts\7za\7za.exe" x $output + +$qt_mysql_dir = ".\qtbase-everywhere-src-5.14.2\src\plugins\sqldrivers\mysql" +qmake.exe MYSQL_INCDIR="$mysql_dir/include" MYSQL_LIBDIR="mysql_dir/lib" "$qt_mysql_dir\mysql.pro" + +nmake.exe +ls + mkdir "rssguard-build" cd "rssguard-build" qmake.exe ..\build.pro "$env:qmake_args" @@ -30,7 +50,8 @@ cd ".." Copy-Item -Path "$ssl_bin\libcrypto*.dll" -Destination ".\app\" Copy-Item -Path "$ssl_bin\libssl*.dll" -Destination ".\app\" -# Build/copy MySQL Qt plugin. +# Copy MySQL Qt plugin. + nmake.exe windows_all cd "$old_pwd" \ No newline at end of file diff --git a/src/librssguard/gui/dialogs/formabout.cpp b/src/librssguard/gui/dialogs/formabout.cpp index 61483008c..dd1b0192b 100644 --- a/src/librssguard/gui/dialogs/formabout.cpp +++ b/src/librssguard/gui/dialogs/formabout.cpp @@ -21,7 +21,7 @@ FormAbout::FormAbout(QWidget* parent) : QDialog(parent) { } FormAbout::~FormAbout() { - qDebug("Destroying FormAbout instance."); + qDebug() << QSslSocket::sslLibraryVersionString(); } void FormAbout::loadSettingsAndPaths() {