feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

TextBrowserHelpViewer: Fix opening external links

Browse Source 
External links were not opening at all. The logic for that was present
for TextBrowserHelpViewer::setSource, but clicking on links would
directly go through the text browsers loadResource method. Avoid that by
turning off openLinks and handling the anchorClicked signal instead.

Task-number: QTCREATORBUG-15491
Change-Id: I86017f14138b98738221c1aed42c37551feaf671
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
This commit is contained in:
Eike Ziller
2015-12-15 17:32:24 +01:00
parent 55b0136923
commit 91ffe63e1a
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/help/textbrowserhelpviewer.cpp
View File

@@ -55,6 +55,7 @@ TextBrowserHelpViewer::TextBrowserHelpViewer(QWidget *parent)
: HelpViewer(parent) : HelpViewer(parent)
, m_textBrowser(new TextBrowserHelpWidget(this)) , m_textBrowser(new TextBrowserHelpWidget(this))
{ {
m_textBrowser->setOpenLinks(false);
QVBoxLayout *layout = new QVBoxLayout; QVBoxLayout *layout = new QVBoxLayout;
setLayout(layout); setLayout(layout);
layout->setContentsMargins(0, 0, 0, 0); layout->setContentsMargins(0, 0, 0, 0);
@@ -68,6 +69,8 @@ TextBrowserHelpViewer::TextBrowserHelpViewer(QWidget *parent)
p.setColor(QPalette::Text, Qt::black); p.setColor(QPalette::Text, Qt::black);
setPalette(p); setPalette(p);
connect(m_textBrowser, &TextBrowserHelpWidget::anchorClicked,
this, &TextBrowserHelpViewer::setSource);
connect(m_textBrowser, SIGNAL(sourceChanged(QUrl)), this, SIGNAL(titleChanged())); connect(m_textBrowser, SIGNAL(sourceChanged(QUrl)), this, SIGNAL(titleChanged()));
connect(m_textBrowser, SIGNAL(forwardAvailable(bool)), this, SIGNAL(forwardAvailable(bool))); connect(m_textBrowser, SIGNAL(forwardAvailable(bool)), this, SIGNAL(forwardAvailable(bool)));
connect(m_textBrowser, SIGNAL(backwardAvailable(bool)), this, SIGNAL(backwardAvailable(bool))); connect(m_textBrowser, SIGNAL(backwardAvailable(bool)), this, SIGNAL(backwardAvailable(bool)));