From 226c721d5709422493f5d0deb41f97abd7d6b1f4 Mon Sep 17 00:00:00 2001 From: David Rosca Date: Sun, 8 Feb 2015 11:45:15 +0100 Subject: [PATCH] BrowserWindow: Remove static WEBKITVERSION --- src/lib/app/browserwindow.cpp | 6 ------ src/lib/app/browserwindow.h | 2 -- src/lib/other/useragentmanager.cpp | 2 +- 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/src/lib/app/browserwindow.cpp b/src/lib/app/browserwindow.cpp index 4a08a8aa7..64efd06e9 100644 --- a/src/lib/app/browserwindow.cpp +++ b/src/lib/app/browserwindow.cpp @@ -105,12 +105,6 @@ #endif #endif /* Q_OS_WIN */ -#if QTWEBENGINE_DISABLED -const QString BrowserWindow::WEBKITVERSION = qWebKitVersion(); -#else -const QString BrowserWindow::WEBKITVERSION = QSL("QtWebEngine"); -#endif - static QKeySequence actionShortcut(QKeySequence shortcut, QKeySequence fallBack, QKeySequence shortcutRTL = QKeySequence(), QKeySequence fallbackRTL = QKeySequence()) { if (QApplication::isRightToLeft() && (!shortcutRTL.isEmpty() || !fallbackRTL.isEmpty())) { diff --git a/src/lib/app/browserwindow.h b/src/lib/app/browserwindow.h index 8301d2caa..693651320 100644 --- a/src/lib/app/browserwindow.h +++ b/src/lib/app/browserwindow.h @@ -58,8 +58,6 @@ class QUPZILLA_EXPORT BrowserWindow : public QMainWindow Q_OBJECT public: - static const QString WEBKITVERSION; - explicit BrowserWindow(Qz::BrowserWindowType type, const QUrl &url = QUrl()); ~BrowserWindow(); diff --git a/src/lib/other/useragentmanager.cpp b/src/lib/other/useragentmanager.cpp index 2143855a1..ddcf70cb4 100644 --- a/src/lib/other/useragentmanager.cpp +++ b/src/lib/other/useragentmanager.cpp @@ -26,7 +26,7 @@ UserAgentManager::UserAgentManager(QObject* parent) : QObject(parent) , m_usePerDomainUserAgent(false) { - m_fakeUserAgent = QString("Mozilla/5.0 (%1) AppleWebKit/%2 (KHTML, like Gecko) Chrome/10.0 Safari/%2").arg(QzTools::operatingSystem(), BrowserWindow::WEBKITVERSION); + m_fakeUserAgent = QString("Mozilla/5.0 (%1) AppleWebKit/%2 (KHTML, like Gecko) Chrome/37.0 Safari/537.36").arg(QzTools::operatingSystem()); } void UserAgentManager::loadSettings()