mirror of
https://invent.kde.org/network/falkon.git
synced 2024-09-22 02:02:10 +02: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:
parent
a8f3c74c74
commit
b37a02e078
|
@ -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()));
|
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)
|
// 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
|
// it may or may not be bug, but this implementation is useless for us
|
||||||
//
|
//
|
||||||
|
@ -643,7 +643,7 @@ void WebView::showSource()
|
||||||
p_QupZilla->showSource();
|
p_QupZilla->showSource();
|
||||||
}
|
}
|
||||||
|
|
||||||
#if QT_VERSION >= 0x040800
|
#if (QTWEBKIT_VERSION >= QTWEBKIT_VERSION_CHECK(2, 2, 0))
|
||||||
void WebView::showSourceOfSelection()
|
void WebView::showSourceOfSelection()
|
||||||
{
|
{
|
||||||
p_QupZilla->showSource(selectedHtml());
|
p_QupZilla->showSource(selectedHtml());
|
||||||
|
|
|
@ -115,7 +115,7 @@ private slots:
|
||||||
void sendLinkByMail();
|
void sendLinkByMail();
|
||||||
void bookmarkLink();
|
void bookmarkLink();
|
||||||
void showSource();
|
void showSource();
|
||||||
#if QT_VERSION >= 0x040800
|
#if (QTWEBKIT_VERSION >= QTWEBKIT_VERSION_CHECK(2, 2, 0))
|
||||||
void showSourceOfSelection();
|
void showSourceOfSelection();
|
||||||
#endif
|
#endif
|
||||||
void showSiteInfo();
|
void showSiteInfo();
|
||||||
|
|
Loading…
Reference in New Issue
Block a user