Merge remote-tracking branch 'origin/4.14' into 4.15

 Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri

Change-Id: I892ea0c3b42f61b9cd24fa5508ec181d8d245d29

2 files changed, 7 insertions, 2 deletions

diff --git a/src/plugins/help/helpwidget.cpp b/src/plugins/help/helpwidget.cpp
index a72ff4c6b4..1f235dcce6 100644
--- a/src/plugins/help/helpwidget.cpp
+++ b/src/plugins/help/helpwidget.cpp
@@ -931,7 +931,10 @@ void HelpWidget::updateCloseButton()
 {
     if (supportsPages()) {
         const bool closeOnReturn = LocalHelpManager::returnOnClose() && m_style == ModeWidget;
-        m_closeAction->setEnabled(closeOnReturn || m_viewerStack->count() > 1);
+        const bool hasMultiplePages = m_viewerStack->count() > 1;
+        m_closeAction->setEnabled(closeOnReturn || hasMultiplePages);
+        m_gotoPrevious->setEnabled(hasMultiplePages);
+        m_gotoNext->setEnabled(hasMultiplePages);
     }
 }
 
diff --git a/src/plugins/help/openpagesswitcher.cpp b/src/plugins/help/openpagesswitcher.cpp
index 20117828a7..5991efd0dd 100644
--- a/src/plugins/help/openpagesswitcher.cpp
+++ b/src/plugins/help/openpagesswitcher.cpp
@@ -81,7 +81,9 @@ void OpenPagesSwitcher::gotoPreviousPage()
 void OpenPagesSwitcher::selectAndHide()
 {
     setVisible(false);
-    emit setCurrentPage(m_openPagesWidget->currentIndex());
+    QModelIndex index = m_openPagesWidget->currentIndex();
+    if (index.isValid())
+        emit setCurrentPage(index);
 }
 
 void OpenPagesSwitcher::selectCurrentPage(int index)