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

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

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

Change-Id: I892ea0c3b42f61b9cd24fa5508ec181d8d245d29
This commit is contained in:
Eike Ziller
2021-03-01 09:49:45 +01:00
parent 9fbd1c26b0 d41bc944cc
commit eaa4592b63
4 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
share/CMakeLists.txt
View File

@@ -6,6 +6,6 @@ if (NOT APPLE AND NOT WIN32)
applications
metainfo
DESTINATION
share
${CMAKE_INSTALL_DATAROOTDIR}
)
endif()

5
src/plugins/help/helpwidget.cpp
View File

@@ -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);
}
}

4
src/plugins/help/openpagesswitcher.cpp
View File

@@ -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)

2
tests/system/shared/qtcreator.py
View File

@@ -66,6 +66,8 @@ def startQC(additionalParameters=None, withPreparedSettingsPath=True, closeLinkT
appWithOptions.extend(('-platform', 'windows:dialogs=none'))
test.log("Starting now: %s" % ' '.join(appWithOptions))
appContext = startApplication(' '.join(appWithOptions))
if closeLinkToQt or cancelTour:
progressBarWait(3000) # wait for the "Updating documentation" progress bar
if closeLinkToQt:
clickButton(waitForObject(":*Qt Creator.Do Not Show Again_QToolButton"))
if cancelTour: