pogmommy/rssguard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Test official qt - finalized.

Browse source
This commit is contained in:
Martin Rotter 2021-01-20 08:04:45 +01:00
parent 037518337e
commit b8d2f05d04
4 changed files with 22 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
resources/desktop/com.github.rssguard.appdata.xml
View file

@ -30,7 +30,7 @@
<url type="donation">https://martinrotter.github.io/donate/</url> <url type="donation">https://martinrotter.github.io/donate/</url>
<content_rating type="oars-1.1" /> <content_rating type="oars-1.1" />
<releases> <releases>
<release version="3.8.4" date="2021-01-18"/> <release version="3.8.4" date="2021-01-20"/>
</releases> </releases>
<content_rating type="oars-1.0"> <content_rating type="oars-1.0">
<content_attribute id="violence-cartoon">none</content_attribute> <content_attribute id="violence-cartoon">none</content_attribute>

2
resources/scripts/7za

@ -1 +1 @@
Subproject commit 9c10723bfbaf6cb85107d6ee16e0324e9e487749 Subproject commit 47f4125753452eff8800dbd6600c5a05540b15d9

28
resources/scripts/github-actions/build-windows.ps1
View file

@ -34,15 +34,24 @@ Invoke-WebRequest -Uri "$maria_link" -OutFile "$maria_output"
& ".\resources\scripts\7za\7za.exe" x $maria_output & ".\resources\scripts\7za\7za.exe" x $maria_output
# Download Qt itself. # Download Qt itself.
$qt_path = "$old_pwd\QtBin" $qt_path = "$old_pwd\qt"
pip3 install aqtinstall pip3 install aqtinstall
aqt install -O "$qt_path" "$qt_version" "windows" "desktop" "win64_msvc2019_64"-m "qtwebengine" aqt install -b "https://mirrors.ocf.berkeley.edu/qt/" -O "$qt_path" "$qt_version" "windows" "desktop" "win64_msvc2019_64"-m "qtwebengine"
$qt_qmake = "$qt_path\bin\qmake.exe" $qt_qmake = "$qt_path\$qt_version\msvc2019_64\bin\qmake.exe"
$env:PATH = "$qt_path\bin\;" + $env:PATH $env:PATH = "$qt_path\$qt_version\msvc2019_64\bin\;" + $env:PATH
# Download openssl.
aqt tool -b "https://mirrors.ocf.berkeley.edu/qt/" -O "$qt_path" windows tools_openssl_x64 1.1.1 qt.tools.openssl.win_x64
$openssl_base_path = "$qt_path\Tools\OpenSSL\Win_x64"
# Build dependencies. # Build dependencies.
.... $maria_path = "$old_pwd\mariadb-$maria_version-winx64"
$qt_sqldrivers_path = "$old_pwd\qtbase-$qt_version\src\plugins\sqldrivers"
cd "$qt_sqldrivers_path"
& $qt_qmake -- MYSQL_INCDIR="$maria_path\include\mysql" MYSQL_LIBDIR="$maria_path\lib"
cd "$old_pwd"
# Build application. # Build application.
mkdir "rssguard-build" mkdir "rssguard-build"
@ -58,11 +67,12 @@ windeployqt.exe --verbose 1 --compiler-runtime --no-translations --release rssgu
cd ".." cd ".."
# Copy OpenSSL. # Copy OpenSSL.
Copy-Item -Path "$qt_path\bin\libcrypto*.dll" -Destination ".\app\" Copy-Item -Path "$openssl_base_path\bin\libcrypto*.dll" -Destination ".\app\"
Copy-Item -Path "$qt_path\bin\libssl*.dll" -Destination ".\app\" Copy-Item -Path "$openssl_base_path\bin\libssl*.dll" -Destination ".\app\"
# Copy MySQL Qt plugin. # Copy MySQL.
Copy-Item -Path "$qt_path\bin\libmariadb.dll" -Destination ".\app\" Copy-Item -Path "$maria_path\lib\libmariadb.dll" -Destination ".\app\"
Copy-Item -Path "$qt_sqldrivers_path\plugins\sqldrivers\qsqlmysql.dll" -Destination ".\app\sqldrivers\" -Force
if ($webengine -eq "true") { if ($webengine -eq "true") {
$packagebase = "rssguard-${git_tag}-${git_revision}-win64" $packagebase = "rssguard-${git_tag}-${git_revision}-win64"

2
src/librssguard/services/owncloud/gui/owncloudaccountdetails.ui
View file

@ -28,7 +28,7 @@
<item row="4" column="0"> <item row="4" column="0">
<widget class="QLabel" name="label"> <widget class="QLabel" name="label">
<property name="text"> <property name="text">
<string>Limit number of downloaded messages per feed</string> <string>Only download newest X messages per feed</string>
</property> </property>
<property name="buddy"> <property name="buddy">
<cstring>m_spinLimitMessages</cstring> <cstring>m_spinLimitMessages</cstring>