Commit 8f8f3745 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

GIT_SILENT: Time to increase version

parent bbdcdfbb
...@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.5) ...@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.5)
set(KDEPIM_VERSION_NUMBER "5.13.40") set(KDEPIM_VERSION_NUMBER "5.13.40")
project(akregator VERSION ${KDEPIM_VERSION_NUMBER}) project(akregator VERSION ${KDEPIM_VERSION_NUMBER})
set(KF5_MIN_VERSION "5.64.0") set(KF5_MIN_VERSION "5.65.0")
set(RELEASE_SERVICE_VERSION "20.03.70") set(RELEASE_SERVICE_VERSION "20.03.70")
find_package(ECM ${KF5_MIN_VERSION} CONFIG REQUIRED) find_package(ECM ${KF5_MIN_VERSION} CONFIG REQUIRED)
......
...@@ -38,7 +38,6 @@ ...@@ -38,7 +38,6 @@
#include "utils.h" #include "utils.h"
#include "feedretriever.h" #include "feedretriever.h"
#include "job/downloadfeediconjob.h" #include "job/downloadfeediconjob.h"
#include <syndication_version.h>
#include <Syndication/Syndication> #include <Syndication/Syndication>
#include "akregator_debug.h" #include "akregator_debug.h"
...@@ -797,7 +796,6 @@ void Feed::fetchCompleted(Syndication::Loader *l, Syndication::FeedPtr doc, Synd ...@@ -797,7 +796,6 @@ void Feed::fetchCompleted(Syndication::Loader *l, Syndication::FeedPtr doc, Synd
loadArticles(); // TODO: make me fly: make this delayed loadArticles(); // TODO: make me fly: make this delayed
#if SYNDICATION_VERSION >= QT_VERSION_CHECK(5, 65, 0)
if (!doc->icon().isNull() && !doc->icon()->url().isEmpty()) { if (!doc->icon().isNull() && !doc->icon()->url().isEmpty()) {
loadFavicon(doc->icon()->url(), false); loadFavicon(doc->icon()->url(), false);
d->m_faviconInfo.width = doc->icon()->width(); d->m_faviconInfo.width = doc->icon()->width();
...@@ -805,9 +803,6 @@ void Feed::fetchCompleted(Syndication::Loader *l, Syndication::FeedPtr doc, Synd ...@@ -805,9 +803,6 @@ void Feed::fetchCompleted(Syndication::Loader *l, Syndication::FeedPtr doc, Synd
} else { } else {
loadFavicon(xmlUrl(), true); loadFavicon(xmlUrl(), true);
} }
#else
loadFavicon(xmlUrl(), true);
#endif
d->m_fetchErrorCode = Syndication::Success; d->m_fetchErrorCode = Syndication::Success;
if (!doc->image().isNull()) { if (!doc->image().isNull()) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment