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

Merge remote-tracking branch 'origin/4.8' into 4.9

Browse Source 
Conflicts:
	src/plugins/android/androidrunnerworker.cpp
	src/plugins/android/androidrunnerworker.h

Change-Id: I52b9117c8a57dc4a34cfc09d1ae9bc76e0752bfc
This commit is contained in:
Eike Ziller
2019-02-04 15:21:55 +01:00
parent 7dba3f083c ffa14187a1
commit 88b29792cb
7 changed files with 86 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -430,7 +430,8 @@ void TextBrowserHelpWidget::mouseReleaseEvent(QMouseEvent *e)
bool controlPressed = e->modifiers() & Qt::ControlModifier;
const QString link = linkAt(e->pos());
if ((controlPressed || e->button() == Qt::MidButton) && !link.isEmpty()) {
if (m_parent->isActionVisible(HelpViewer::Action::NewPage)
&& (controlPressed || e->button() == Qt::MidButton) && !link.isEmpty()) {
emit m_parent->newPageRequested(QUrl(link));
return;
}