FreshRSS/rssguard
1
0
Fork 0
mirror of https://github.com/martinrotter/rssguard.git synced 2025-01-19 12:22:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #181 from TrunovS/qt_5_7_1_build

Browse Source 
Small corrections to build with qt_5_7_1 on debian stretch.
This commit is contained in:
martinrotter 2018-02-12 09:22:20 +01:00 committed by GitHub
commit 3ec60aa5de
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rssguard.pro
View File

@ -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"

2
src/gui/searchtextwidget.cpp
View File

@ -5,6 +5,8 @@
#include "miscellaneous/application.h"
#include "miscellaneous/iconfactory.h"
#include <QKeyEvent>
SearchTextWidget::SearchTextWidget(QWidget* parent) : QWidget(parent) {
m_ui.setupUi(this);
setFocusProxy(m_ui.m_txtSearch);

1
src/gui/webbrowser.cpp
View File

@ -18,6 +18,7 @@
#include <QToolTip>
#include <QWebEngineSettings>
#include <QWidgetAction>
#include <QKeyEvent>
WebBrowser::WebBrowser(QWidget* parent) : TabContent(parent),
m_layout(new QVBoxLayout(this)),

1
src/network-web/oauth2service.h
View File

@ -26,6 +26,7 @@
#define OAUTH2SERVICE_H
#include <QObject>
#include <QUrl>
#include "network-web/silentnetworkaccessmanager.h"

2
src/services/inoreader/network/inoreadernetworkfactory.cpp
View File

@ -311,7 +311,7 @@ QList<Message> 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();