1
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-20 02:36:34 +01:00

[QtWebKit 2.3] Disable unnecessary workarounds.

Disabled touch mocking and fake user agent.
This commit is contained in:
nowrep 2013-01-09 19:00:48 +01:00
parent 64a180d1fe
commit 6bf53c0332
2 changed files with 3 additions and 3 deletions

View File

@ -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;
}

View File

@ -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;
}