diff --git a/rssguard.pro b/rssguard.pro index 9506285db..848adbeaf 100755 --- a/rssguard.pro +++ b/rssguard.pro @@ -196,6 +196,10 @@ MOC_DIR = $$OUT_PWD/moc RCC_DIR = $$OUT_PWD/rcc UI_DIR = $$OUT_PWD/ui +mac { + QT *= macextras +} + equals(USE_WEBENGINE, true) { message(rssguard: Application will be compiled WITH QtWebEngine module.) QT *= webenginewidgets diff --git a/src/core/feeddownloader.cpp b/src/core/feeddownloader.cpp index ac741c93a..47871d2b0 100755 --- a/src/core/feeddownloader.cpp +++ b/src/core/feeddownloader.cpp @@ -23,6 +23,8 @@ #include "services/abstract/feed.h" #include +#include +#include #include #include #include @@ -118,15 +120,11 @@ void FeedDownloader::oneFeedUpdateFinished(const QList& messages, bool // Now make sure, that messages are actually stored to SQL in a locked state. qDebug().nospace() << "Saving messages of feed " - << feed->id() << " in thread: \'" + << feed->customId() << " in thread: \'" << QThread::currentThreadId() << "\'."; int updated_messages = feed->updateMessages(messages, error_during_obtaining); - /* - QMetaObject::invokeMethod(feed, "updateMessages", Qt::BlockingQueuedConnection, - Q_RETURN_ARG(int, updated_messages), - Q_ARG(QList, messages)); - */ + qDebug("%d messages for feed %d stored in DB.", updated_messages, feed->customId()); if (updated_messages > 0) { m_results.appendUpdatedFeed(QPair(feed->title(), updated_messages)); diff --git a/src/gui/settings/settingsfeedsmessages.ui b/src/gui/settings/settingsfeedsmessages.ui index 68ba6e17d..3cc2d14fd 100755 --- a/src/gui/settings/settingsfeedsmessages.ui +++ b/src/gui/settings/settingsfeedsmessages.ui @@ -61,6 +61,12 @@ false + + + 150 + 0 + + false @@ -320,8 +326,6 @@ m_checkMessagesDateTimeFormat m_cmbMessagesDateTimeFormat m_btnChangeMessagesFont - m_spinHeightRowsMessages_3 - m_spinHeightRowsMessages_2 diff --git a/src/gui/timespinbox.cpp b/src/gui/timespinbox.cpp index e6a9ce3d3..7548f67c2 100755 --- a/src/gui/timespinbox.cpp +++ b/src/gui/timespinbox.cpp @@ -21,7 +21,7 @@ #include TimeSpinBox::TimeSpinBox(QWidget* parent) : QDoubleSpinBox(parent) { - setMinimum(5.0); + setMinimum(3.0); setAccelerated(true); setDecimals(0); setMaximum(10000000.0);