FreshRSS/rssguard
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Link against qtmacextras.

Browse Source
This commit is contained in:
Martin Rotter 2017-10-13 09:17:58 +02:00
parent e49ffb49d8
commit ef5186c7a8
4 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rssguard.pro
View File

@ -196,6 +196,10 @@ MOC_DIR = $$OUT_PWD/moc
RCC_DIR = $$OUT_PWD/rcc RCC_DIR = $$OUT_PWD/rcc
UI_DIR = $$OUT_PWD/ui UI_DIR = $$OUT_PWD/ui
mac {
QT *= macextras
}
equals(USE_WEBENGINE, true) { equals(USE_WEBENGINE, true) {
message(rssguard: Application will be compiled WITH QtWebEngine module.) message(rssguard: Application will be compiled WITH QtWebEngine module.)
QT *= webenginewidgets QT *= webenginewidgets

10
src/core/feeddownloader.cpp
View File

@ -23,6 +23,8 @@
#include "services/abstract/feed.h" #include "services/abstract/feed.h"
#include <QDebug> #include <QDebug>
#include <QMessageBox>
#include <QMessageLogger>
#include <QMutexLocker> #include <QMutexLocker>
#include <QString> #include <QString>
#include <QThread> #include <QThread>
@ -118,15 +120,11 @@ void FeedDownloader::oneFeedUpdateFinished(const QList<Message>& messages, bool
// Now make sure, that messages are actually stored to SQL in a locked state. // Now make sure, that messages are actually stored to SQL in a locked state.
qDebug().nospace() << "Saving messages of feed " qDebug().nospace() << "Saving messages of feed "
<< feed->id() << " in thread: \'" << feed->customId() << " in thread: \'"
<< QThread::currentThreadId() << "\'."; << QThread::currentThreadId() << "\'.";
int updated_messages = feed->updateMessages(messages, error_during_obtaining); int updated_messages = feed->updateMessages(messages, error_during_obtaining);
/* qDebug("%d messages for feed %d stored in DB.", updated_messages, feed->customId());
QMetaObject::invokeMethod(feed, "updateMessages", Qt::BlockingQueuedConnection,
Q_RETURN_ARG(int, updated_messages),
Q_ARG(QList<Message>, messages));
*/
if (updated_messages > 0) { if (updated_messages > 0) {
m_results.appendUpdatedFeed(QPair<QString, int>(feed->title(), updated_messages)); m_results.appendUpdatedFeed(QPair<QString, int>(feed->title(), updated_messages));

8
src/gui/settings/settingsfeedsmessages.ui
View File

@ -61,6 +61,12 @@
<property name="enabled"> <property name="enabled">
<bool>false</bool> <bool>false</bool>
</property> </property>
<property name="minimumSize">
<size>
<width>150</width>
<height>0</height>
</size>
</property>
<property name="readOnly"> <property name="readOnly">
<bool>false</bool> <bool>false</bool>
</property> </property>
@ -320,8 +326,6 @@
<tabstop>m_checkMessagesDateTimeFormat</tabstop> <tabstop>m_checkMessagesDateTimeFormat</tabstop>
<tabstop>m_cmbMessagesDateTimeFormat</tabstop> <tabstop>m_cmbMessagesDateTimeFormat</tabstop>
<tabstop>m_btnChangeMessagesFont</tabstop> <tabstop>m_btnChangeMessagesFont</tabstop>
<tabstop>m_spinHeightRowsMessages_3</tabstop>
<tabstop>m_spinHeightRowsMessages_2</tabstop>
</tabstops> </tabstops>
<resources/> <resources/>
<connections/> <connections/>

2
src/gui/timespinbox.cpp
View File

@ -21,7 +21,7 @@
#include <QStringList> #include <QStringList>
TimeSpinBox::TimeSpinBox(QWidget* parent) : QDoubleSpinBox(parent) { TimeSpinBox::TimeSpinBox(QWidget* parent) : QDoubleSpinBox(parent) {
setMinimum(5.0); setMinimum(3.0);
setAccelerated(true); setAccelerated(true);
setDecimals(0); setDecimals(0);
setMaximum(10000000.0); setMaximum(10000000.0);