mirror of
https://invent.kde.org/network/falkon.git
synced 2024-11-11 01:22:10 +01:00
[QtWebKit 2.3] Disable unnecessary workarounds.
Disabled touch mocking and fake user agent.
This commit is contained in:
parent
64a180d1fe
commit
6bf53c0332
|
@ -61,7 +61,7 @@ QString UserAgentManager::userAgentForUrl(const QUrl &url) const
|
|||
}
|
||||
}
|
||||
|
||||
#if QT_VERSION < 0x050000
|
||||
#if QT_VERSION < 0x050000 && (QTWEBKIT_VERSION < QTWEBKIT_VERSION_CHECK(2, 3, 0))
|
||||
if (host.contains(QLatin1String("google"))) {
|
||||
return m_fakeUserAgent;
|
||||
}
|
||||
|
|
|
@ -1156,8 +1156,8 @@ void WebView::setZoom(int zoom)
|
|||
///
|
||||
bool WebView::eventFilter(QObject* obj, QEvent* event)
|
||||
{
|
||||
// This hack is no longer needed with Qt 5
|
||||
#if QT_VERSION < 0x050000
|
||||
// This hack is no longer needed with QtWebKit 2.3 (bundled in Qt 5)
|
||||
#if QT_VERSION < 0x050000 && (QTWEBKIT_VERSION < QTWEBKIT_VERSION_CHECK(2, 3, 0))
|
||||
if (obj != this || m_disableTouchMocking) {
|
||||
return false;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue
Block a user