From 5e8064c3446593cac7bdf1ec7f282238c020bd69 Mon Sep 17 00:00:00 2001 From: Trunov Sergey Date: Sat, 10 Feb 2018 23:22:26 +0300 Subject: [PATCH 1/2] Small corrections to build with qt_5_7_1 on debian stretch. --- rssguard.pro | 6 +++--- src/gui/searchtextwidget.cpp | 1 + src/gui/webbrowser.cpp | 1 + src/network-web/oauth2service.h | 1 + src/services/inoreader/network/inoreadernetworkfactory.cpp | 2 +- 5 files changed, 7 insertions(+), 4 deletions(-) diff --git a/rssguard.pro b/rssguard.pro index 9accb6bf1..164bee772 100755 --- a/rssguard.pro +++ b/rssguard.pro @@ -30,7 +30,7 @@ # # Other information: # - supports Windows, Linux, Mac OS X, Android, -# - Qt 5.8.0 or higher is required, +# - Qt 5.7.1 or higher is required, # - C++ 11 is required. # # Authors and contributors: @@ -45,8 +45,8 @@ DEFINES *= QT_USE_QSTRINGBUILDER message(rssguard: Welcome RSS Guard qmake script.) -lessThan(QT_MAJOR_VERSION, 5)|lessThan(QT_MINOR_VERSION, 8) { - error(rssguard: At least Qt \"5.8.0\" is required!!!) +lessThan(QT_MAJOR_VERSION, 5)|lessThan(QT_MINOR_VERSION, 7)|lessThan(QT_PATCH_VERSION, 1) { + error(rssguard: At least Qt \"5.7.1\" is required!!!) } APP_NAME = "RSS Guard" diff --git a/src/gui/searchtextwidget.cpp b/src/gui/searchtextwidget.cpp index 69c596842..020291cd7 100755 --- a/src/gui/searchtextwidget.cpp +++ b/src/gui/searchtextwidget.cpp @@ -4,6 +4,7 @@ #include "miscellaneous/application.h" #include "miscellaneous/iconfactory.h" +#include SearchTextWidget::SearchTextWidget(QWidget* parent) : QWidget(parent) { m_ui.setupUi(this); diff --git a/src/gui/webbrowser.cpp b/src/gui/webbrowser.cpp index 7212f8069..8d75777aa 100755 --- a/src/gui/webbrowser.cpp +++ b/src/gui/webbrowser.cpp @@ -18,6 +18,7 @@ #include #include #include +#include WebBrowser::WebBrowser(QWidget* parent) : TabContent(parent), m_layout(new QVBoxLayout(this)), diff --git a/src/network-web/oauth2service.h b/src/network-web/oauth2service.h index daade8828..f03fe42ad 100755 --- a/src/network-web/oauth2service.h +++ b/src/network-web/oauth2service.h @@ -26,6 +26,7 @@ #define OAUTH2SERVICE_H #include +#include #include "network-web/silentnetworkaccessmanager.h" diff --git a/src/services/inoreader/network/inoreadernetworkfactory.cpp b/src/services/inoreader/network/inoreadernetworkfactory.cpp index f2740200a..8f68466e7 100755 --- a/src/services/inoreader/network/inoreadernetworkfactory.cpp +++ b/src/services/inoreader/network/inoreadernetworkfactory.cpp @@ -311,7 +311,7 @@ QList InoreaderNetworkFactory::decodeMessages(const QString& messages_j message.m_title = message_obj["title"].toString(); message.m_author = message_obj["author"].toString(); - message.m_created = QDateTime::fromSecsSinceEpoch(message_obj["published"].toInt()); + message.m_created = QDateTime::fromMSecsSinceEpoch(message_obj["published"].toInt()*1000); message.m_createdFromFeed = true; message.m_customId = message_obj["id"].toString(); From ae941d4d01ab03dcb964772f75b3202c900a34ec Mon Sep 17 00:00:00 2001 From: martinrotter Date: Mon, 12 Feb 2018 09:21:56 +0100 Subject: [PATCH 2/2] Update searchtextwidget.cpp --- src/gui/searchtextwidget.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/gui/searchtextwidget.cpp b/src/gui/searchtextwidget.cpp index 020291cd7..cc8acf259 100755 --- a/src/gui/searchtextwidget.cpp +++ b/src/gui/searchtextwidget.cpp @@ -4,6 +4,7 @@ #include "miscellaneous/application.h" #include "miscellaneous/iconfactory.h" + #include SearchTextWidget::SearchTextWidget(QWidget* parent) : QWidget(parent) {