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

fix build

Browse Source
This commit is contained in:
Martin Rotter 2023-12-19 08:53:32 +01:00
parent bf2ca8325c
commit a242564f9c
4 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/librssguard/database/databasequeries.cpp
View File

@ -424,7 +424,7 @@ void DatabaseQueries::markMessagesReadUnreadImportant(const QSqlDatabase& db,
const QStringList& custom_ids, const QStringList& custom_ids,
RootItem::ReadStatus read, RootItem::ReadStatus read,
RootItem::Importance important) { RootItem::Importance important) {
auto stringed_ids = boolinq::from(custom_ids) auto stringed_ids = boolinq::from(custom_ids.begin(), custom_ids.end())
.select([](const QString& id) { .select([](const QString& id) {
return QSL("'%1'").arg(id); return QSL("'%1'").arg(id);
}) })

2
src/librssguard/gui/tabwidget.cpp
View File

@ -244,7 +244,7 @@ int TabWidget::addEmptyBrowser() {
#if defined(ENABLE_MEDIAPLAYER) #if defined(ENABLE_MEDIAPLAYER)
int TabWidget::addMediaPlayer(const QString& url, bool make_active) { int TabWidget::addMediaPlayer(const QString& url, bool make_active) {
// #if defined(ENABLE_MEDIAPLAYER_LIBMPV) // #if defined(ENABLE_MEDIAPLAYER_LIBMPV)
// QQuickWindow::setGraphicsApi(QSGRendererInterface::GraphicsApi::OpenGL); // QQuickWindow::setGraphicsApi(QSGRendererInterface::GraphicsApi::OpenGL);
// #endif // #endif
auto* player = new MediaPlayer(this); auto* player = new MediaPlayer(this);

1
src/librssguard/gui/webviewers/webengine/webengineviewer.cpp
View File

@ -22,7 +22,6 @@
#if QT_VERSION_MAJOR == 6 #if QT_VERSION_MAJOR == 6
#include <QWebEngineContextMenuRequest> #include <QWebEngineContextMenuRequest>
#else #else
#include <QOpenGLWidget>
#include <QWebEngineContextMenuData> #include <QWebEngineContextMenuData>
#endif #endif

6
src/rssguard/main.cpp
View File

@ -53,10 +53,8 @@ int main(int argc, char* argv[]) {
Q_INIT_RESOURCE(rssguard); Q_INIT_RESOURCE(rssguard);
#endif #endif
// Ensure that ini format is used as application settings storage on macOS. QSettings::setDefaultFormat(QSettings::Format::IniFormat);
QSettings::setDefaultFormat(QSettings::IniFormat); QApplication::setAttribute(Qt::ApplicationAttribute::AA_UseDesktopOpenGL, true);
QApplication::setAttribute(Qt::AA_UseDesktopOpenGL, true);
// We create our own "arguments" list as Qt strips something // We create our own "arguments" list as Qt strips something
// sometimes out. // sometimes out.