Skip to content

Commit 8cfbcf4

Browse files
committed
chore: clean UA & disable js debug in app stdout
1 parent 046e2e1 commit 8cfbcf4

File tree

2 files changed

+50
-23
lines changed

2 files changed

+50
-23
lines changed

src/webenginepage.cpp

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,13 @@
66

77
WebEnginePage::WebEnginePage(QWebEngineProfile *profile, QObject *parent)
88
: QWebEnginePage(profile, parent) {
9-
profile->setHttpUserAgent(
10-
profile->httpUserAgent().replace("QtWebEngine/5.13.0", ""));
9+
10+
auto userAgent = profile->httpUserAgent();
11+
auto webengineversion = userAgent.split("QtWebEngine").last().split(" ").first();
12+
auto toRemove = "QtWebEngine"+webengineversion;
13+
auto cleanUserAgent = userAgent.remove(toRemove).replace(" ", " ");
14+
profile->setHttpUserAgent(cleanUserAgent);
15+
1116
connect(this, &QWebEnginePage::loadFinished, this,
1217
&WebEnginePage::handleLoadFinished);
1318
connect(this, &QWebEnginePage::authenticationRequired, this,
@@ -286,3 +291,12 @@ void WebEnginePage::handleSelectClientCertificate(
286291
qDebug() << selection.host();
287292
}
288293
#endif
294+
295+
void WebEnginePage::javaScriptConsoleMessage(
296+
WebEnginePage::JavaScriptConsoleMessageLevel level, const QString &message,
297+
int lineId, const QString &sourceId) {
298+
Q_UNUSED(level);
299+
Q_UNUSED(message);
300+
Q_UNUSED(lineId);
301+
Q_UNUSED(sourceId);
302+
}

src/webenginepage.h

Lines changed: 34 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,66 @@
11
#ifndef WEBENGINEPAGE_H
22
#define WEBENGINEPAGE_H
33

4-
54
#include <QFileDialog>
65
#include <QWebEngineFullScreenRequest>
76
#include <QWebEngineNotification>
87
#include <QWebEngineProfile>
98

10-
#include <QWebEnginePage>
9+
#include <QAuthenticator>
1110
#include <QDesktopServices>
12-
#include <QMessageBox>
1311
#include <QImageReader>
12+
#include <QMessageBox>
1413
#include <QWebEngineCertificateError>
15-
#include <QAuthenticator>
14+
#include <QWebEnginePage>
1615

17-
#include <QWebEngineRegisterProtocolHandlerRequest>
1816
#include <QWebEngineFullScreenRequest>
17+
#include <QWebEngineRegisterProtocolHandlerRequest>
1918

2019
#include <QSettings>
2120

2221
#include "ui_certificateerrordialog.h"
2322
#include "ui_passworddialog.h"
2423

25-
class WebEnginePage : public QWebEnginePage
26-
{
27-
Q_OBJECT
24+
class WebEnginePage : public QWebEnginePage {
25+
Q_OBJECT
2826
public:
29-
WebEnginePage(QWebEngineProfile *profile, QObject *parent = nullptr);
27+
WebEnginePage(QWebEngineProfile *profile, QObject *parent = nullptr);
3028

3129
private:
32-
QSettings settings;
30+
QSettings settings;
31+
3332
protected:
34-
bool acceptNavigationRequest(const QUrl &url, QWebEnginePage::NavigationType type, bool isMainFrame) override;
35-
QWebEnginePage* createWindow(QWebEnginePage::WebWindowType type) override;
36-
bool certificateError(const QWebEngineCertificateError &error) override;
37-
QStringList chooseFiles(FileSelectionMode mode, const QStringList &oldFiles, const QStringList &acceptedMimeTypes);
33+
bool acceptNavigationRequest(const QUrl &url,
34+
QWebEnginePage::NavigationType type,
35+
bool isMainFrame) override;
36+
QWebEnginePage *createWindow(QWebEnginePage::WebWindowType type) override;
37+
bool certificateError(const QWebEngineCertificateError &error) override;
38+
QStringList chooseFiles(FileSelectionMode mode, const QStringList &oldFiles,
39+
const QStringList &acceptedMimeTypes);
3840

3941
public slots:
40-
void handleFeaturePermissionRequested(const QUrl &securityOrigin, QWebEnginePage::Feature feature);
41-
void handleLoadFinished(bool ok);
42+
void handleFeaturePermissionRequested(const QUrl &securityOrigin,
43+
QWebEnginePage::Feature feature);
44+
void handleLoadFinished(bool ok);
4245

46+
protected slots:
47+
void
48+
javaScriptConsoleMessage(WebEnginePage::JavaScriptConsoleMessageLevel level,
49+
const QString &message, int lineId,
50+
const QString &sourceId);
4351
private slots:
44-
void handleAuthenticationRequired(const QUrl &requestUrl, QAuthenticator *auth);
45-
void handleProxyAuthenticationRequired(const QUrl &requestUrl, QAuthenticator *auth, const QString &proxyHost);
46-
void handleRegisterProtocolHandlerRequested(QWebEngineRegisterProtocolHandlerRequest request);
52+
void handleAuthenticationRequired(const QUrl &requestUrl,
53+
QAuthenticator *auth);
54+
void handleProxyAuthenticationRequired(const QUrl &requestUrl,
55+
QAuthenticator *auth,
56+
const QString &proxyHost);
57+
void handleRegisterProtocolHandlerRequested(
58+
QWebEngineRegisterProtocolHandlerRequest request);
4759
#if !defined(QT_NO_SSL) || QT_VERSION >= QT_VERSION_CHECK(5, 12, 0)
48-
void handleSelectClientCertificate(QWebEngineClientCertificateSelection clientCertSelection);
60+
void handleSelectClientCertificate(
61+
QWebEngineClientCertificateSelection clientCertSelection);
4962
#endif
50-
void fullScreenRequestedByPage(QWebEngineFullScreenRequest request);
63+
void fullScreenRequestedByPage(QWebEngineFullScreenRequest request);
5164
};
5265

5366
#endif // WEBENGINEPAGE_H

0 commit comments

Comments
 (0)