From 775b507ae2188a91d644a56ea3092e72d9ee9c97 Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Wed, 15 Nov 2023 07:16:40 +0100 Subject: [PATCH] fix mariadb link --- resources/graphics/misc/flags/es_ES.png | Bin 1397 -> 0 bytes resources/rssguard.qrc | 2 +- .../scripts/github-actions/build-windows.ps1 | 2 +- src/rssguard/main.cpp | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) delete mode 100644 resources/graphics/misc/flags/es_ES.png diff --git a/resources/graphics/misc/flags/es_ES.png b/resources/graphics/misc/flags/es_ES.png deleted file mode 100644 index 38b66bc4a8fe8ad91f74a0ee1ffdcba9b5f25718..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1397 zcmV-*1&aEKP)(_`g8%^e{{R4h=>PzAFaQARU;qF*m;eA5Z<1fd zMgRZ=`$P!}fd(3K05N;Cv?L5xA8F%oeDf&xlyLqD16e7ui)kBj%_qr(i8Vv!en zl9M;R@7~+J@;KDBE(rNVlFEHRsj6p0Vp5=IMFjsq5;!OQWHwB@!*lEsG%wyDL>^ zN2Px>x7J`nTSEZaAfAW#ev^Ny8Vr*r?-VVTtqHisc3RBYTEz3hMXv$S;CbM=@dyCV ztFpxosV5lE!+3sd091<5st3gNLf5qPTZ7kIwcQ7ivKO+Z0$}i@hC~UZyp-wgKMIu$ z0d!V8AR0^=#9f@hQ2|nR9j;tU@yM`;ZAD{^x<3GNpp5{e)S5yH0w01&Xz!cBauoAoV3SQUF->mRhOudS(-sK@ zb5lYlBiMGclrAmyg1fCj>-PbI5CCrTz7AYJ55Ih*+548o;LA`v<52iru*Nms`ZiYY zhTg4ZuKXBq_G81&LlzsJ0+u5)i%@ZK1i*mgT2s@5haOYpk9J_E3rrmWo$yGX_vkwE z2H6eUDP6qGT-v2?=v_u$>7;+C2!Y&bQ(dCCQLRnuu(!05H0C;%ZbaSWber=dUq0aSZJn0uRsu%JE5W&SKA%=@>WYgoXIC z6pHVW-B*ZMAj_asO9`t&p_;oJRA~^4ufE^U=-B}-k3Eeu9d zy^Vnb9_Oy?;fwDEIeYF!Nci^<1GneCF?wMP)B>jo-;81F#vhn3XUL|<=-C08EeQ&$ zgk3yE-<~v%5t2QM!9Oq2_QW*V&Z(%dGs_SIrn=|~*zDfuxsXbl<~#8NDGr`*;q*;E zYE|8#)S{w)IWo%KZxL!Cg|4nQv?VO0B(VUY+M%rLiaF6H{ID3K%MOVEgcK69ND4hD zUvyPyb1jX=@0zJ%vsL@@r()y)Rb_k412LtL9c>FCn$FJHQK@>opUvmuctxNU&<|_@ zdShn%B=Bo=WT!KF#z|ZtuU2mAR{*R4SOM^#%0B}DL-*vjz;Xam00000NkvXXu0mjf Dd9RAw diff --git a/resources/rssguard.qrc b/resources/rssguard.qrc index a23ed2954..4e0984fd8 100644 --- a/resources/rssguard.qrc +++ b/resources/rssguard.qrc @@ -56,7 +56,7 @@ graphics/misc/flags/de.png graphics/misc/flags/en_GB.png graphics/misc/flags/en_US.png - graphics/misc/flags/es_ES.png + graphics/misc/flags/es.png graphics/misc/flags/fi.png graphics/misc/flags/fr.png graphics/misc/flags/gl.png diff --git a/resources/scripts/github-actions/build-windows.ps1 b/resources/scripts/github-actions/build-windows.ps1 index 7f5b3e11e..f812fc7a7 100755 --- a/resources/scripts/github-actions/build-windows.ps1 +++ b/resources/scripts/github-actions/build-windows.ps1 @@ -30,7 +30,7 @@ else { $is_qt_6 = $qt_version.StartsWith("6") $maria_version = "11.1.2" -$maria_link = "https://mirror.netcologne.de/mariadb/mariadb-$maria_version/winx64-packages/mariadb-$maria_version-winx64.zip" +$maria_link = "https://archive.mariadb.org/mariadb-$maria_version/winx64-packages/mariadb-$maria_version-winx64.zip" $maria_output = "maria.zip" $cmake_version = "3.27.7" diff --git a/src/rssguard/main.cpp b/src/rssguard/main.cpp index 1dfc44515..69c6c54bc 100644 --- a/src/rssguard/main.cpp +++ b/src/rssguard/main.cpp @@ -35,7 +35,7 @@ int main(int argc, char* argv[]) { #endif #if defined(Q_OS_UNIX) && !defined(Q_OS_MACOS) - QApplication::setDesktopFileName(APP_REVERSE_NAME); + QGuiApplication::setDesktopFileName(APP_REVERSE_NAME); #endif #if defined(QT_STATIC)