fix build

martinrotter · Dec 19, 2023 · a242564 · a242564
1 parent bf2ca83
commit a242564
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 7 deletions.
diff --git 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
@@ -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
@@ -22,7 +22,6 @@
 #if QT_VERSION_MAJOR == 6
 #include <QWebEngineContextMenuRequest>
 #else
-#include <QOpenGLWidget>
 #include <QWebEngineContextMenuData>
 #endif
 

diff --git 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.