chore: update deprecated Qt code (#2065)

Screenly · Sep 12, 2024 · 3808372 · 3808372
1 parent 8d74226
commit 3808372
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 8 deletions.
diff --git a/webview/ScreenlyWebview.pro b/webview/ScreenlyWebview.pro
@@ -1,6 +1,6 @@
 TEMPLATE = app
 
-QT += webengine webenginewidgets dbus
+QT += webenginecore webenginewidgets dbus
 CONFIG += c++11
 
 SOURCES += src/main.cpp \

diff --git a/webview/src/main.cpp b/webview/src/main.cpp
@@ -1,7 +1,6 @@
 #include <QApplication>
 #include <QDebug>
 #include <QtDBus>
-#include <QtWebEngine>
 #include <QWebEngineView>
 
 #include "mainwindow.h"

diff --git a/webview/src/mainwindow.cpp b/webview/src/mainwindow.cpp
@@ -7,12 +7,9 @@
 
 MainWindow::MainWindow() : QMainWindow()
 {
-    QWebEngineSettings::globalSettings() -> setAttribute(QWebEngineSettings::LocalStorageEnabled, true);
-
-    // for QT5.10 and higher
-    QWebEngineSettings::globalSettings() -> setAttribute(QWebEngineSettings::ShowScrollBars, false);
-
     view = new View(this);
+    view -> settings() -> setAttribute(QWebEngineSettings::LocalStorageEnabled, false);
+    view -> settings() -> setAttribute(QWebEngineSettings::ShowScrollBars, false);
     setCentralWidget(view);
 }
 

diff --git a/webview/src/view.cpp b/webview/src/view.cpp
@@ -76,5 +76,5 @@ void View::handleAuthRequest(QNetworkReply* reply, QAuthenticator* auth)
 {
     Q_UNUSED(reply)
     Q_UNUSED(auth)
-    load(QUrl::fromLocalFile(QStandardPaths::locate(QStandardPaths::DataLocation, "res/access_denied.html")));
+    load(QUrl::fromLocalFile(QStandardPaths::locate(QStandardPaths::AppDataLocation, "res/access_denied.html")));
 }
diff --git a/webview/src/view.h b/webview/src/view.h
@@ -4,6 +4,7 @@
 #include <QWebEnginePage>
 #include <QWidget>
 #include <QEventLoop>
+#include <QNetworkReply>
 
 class View : public QWebEngineView
 {