From a242564f9c81d1615bab34a36730998bfe36c6d3 Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Tue, 19 Dec 2023 08:53:32 +0100 Subject: [PATCH] fix build --- src/librssguard/database/databasequeries.cpp | 2 +- src/librssguard/gui/tabwidget.cpp | 2 +- .../gui/webviewers/webengine/webengineviewer.cpp | 1 - src/rssguard/main.cpp | 6 ++---- 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/librssguard/database/databasequeries.cpp b/src/librssguard/database/databasequeries.cpp index 0e6baa755..be8de43a8 100644 --- a/src/librssguard/database/databasequeries.cpp +++ b/src/librssguard/database/databasequeries.cpp @@ -424,7 +424,7 @@ void DatabaseQueries::markMessagesReadUnreadImportant(const QSqlDatabase& db, const QStringList& custom_ids, RootItem::ReadStatus read, 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) { return QSL("'%1'").arg(id); }) diff --git a/src/librssguard/gui/tabwidget.cpp b/src/librssguard/gui/tabwidget.cpp index 19062f9bd..d7354a5b4 100644 --- a/src/librssguard/gui/tabwidget.cpp +++ b/src/librssguard/gui/tabwidget.cpp @@ -244,7 +244,7 @@ int TabWidget::addEmptyBrowser() { #if defined(ENABLE_MEDIAPLAYER) int TabWidget::addMediaPlayer(const QString& url, bool make_active) { // #if defined(ENABLE_MEDIAPLAYER_LIBMPV) - // QQuickWindow::setGraphicsApi(QSGRendererInterface::GraphicsApi::OpenGL); + // QQuickWindow::setGraphicsApi(QSGRendererInterface::GraphicsApi::OpenGL); // #endif auto* player = new MediaPlayer(this); diff --git a/src/librssguard/gui/webviewers/webengine/webengineviewer.cpp b/src/librssguard/gui/webviewers/webengine/webengineviewer.cpp index ae47b28f9..f3b14c83d 100644 --- a/src/librssguard/gui/webviewers/webengine/webengineviewer.cpp +++ b/src/librssguard/gui/webviewers/webengine/webengineviewer.cpp @@ -22,7 +22,6 @@ #if QT_VERSION_MAJOR == 6 #include #else -#include #include #endif diff --git a/src/rssguard/main.cpp b/src/rssguard/main.cpp index 463f7bdd0..48ae7475a 100644 --- a/src/rssguard/main.cpp +++ b/src/rssguard/main.cpp @@ -53,10 +53,8 @@ int main(int argc, char* argv[]) { Q_INIT_RESOURCE(rssguard); #endif - // Ensure that ini format is used as application settings storage on macOS. - QSettings::setDefaultFormat(QSettings::IniFormat); - - QApplication::setAttribute(Qt::AA_UseDesktopOpenGL, true); + QSettings::setDefaultFormat(QSettings::Format::IniFormat); + QApplication::setAttribute(Qt::ApplicationAttribute::AA_UseDesktopOpenGL, true); // We create our own "arguments" list as Qt strips something // sometimes out.