1
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-20 10:46:35 +01:00

Checking QtWebKit version rather than global Qt version. See #96

- choose (not) to compile with using QWebView::selectedHtml function
This commit is contained in:
nowrep 2011-12-26 22:54:03 +01:00
parent a8f3c74c74
commit b37a02e078
2 changed files with 3 additions and 3 deletions

View File

@ -540,7 +540,7 @@ void WebView::contextMenuEvent(QContextMenuEvent* event)
m_menu->addAction(engine.icon, tr("Search \"%1 ..\" with %2").arg(selectedText, engine.name), this, SLOT(searchSelectedText()));
}
#if QT_VERSION == 0x040800
#if (QTWEBKIT_VERSION >= QTWEBKIT_VERSION_CHECK(2, 2, 0))
// still bugged in 4.8 RC (it shows selection of webkit's internal source, not html from page)
// it may or may not be bug, but this implementation is useless for us
//
@ -643,7 +643,7 @@ void WebView::showSource()
p_QupZilla->showSource();
}
#if QT_VERSION >= 0x040800
#if (QTWEBKIT_VERSION >= QTWEBKIT_VERSION_CHECK(2, 2, 0))
void WebView::showSourceOfSelection()
{
p_QupZilla->showSource(selectedHtml());

View File

@ -115,7 +115,7 @@ private slots:
void sendLinkByMail();
void bookmarkLink();
void showSource();
#if QT_VERSION >= 0x040800
#if (QTWEBKIT_VERSION >= QTWEBKIT_VERSION_CHECK(2, 2, 0))
void showSourceOfSelection();
#endif
void showSiteInfo();