From fc5af03862d117b68a3fb99db083c47b9dd17ff6 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Wed, 24 Feb 2021 19:50:39 +0100 Subject: [PATCH 1/4] Bump version to 4.14.2 Change-Id: I792587c71eadf0b2602d73e7fa4be324cc2766cf Reviewed-by: Eike Ziller --- cmake/QtCreatorIDEBranding.cmake | 4 ++-- qbs/modules/qtc/qtc.qbs | 4 ++-- qtcreator_ide_branding.pri | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cmake/QtCreatorIDEBranding.cmake b/cmake/QtCreatorIDEBranding.cmake index a431bb7343d..b9c7f5d4919 100644 --- a/cmake/QtCreatorIDEBranding.cmake +++ b/cmake/QtCreatorIDEBranding.cmake @@ -1,6 +1,6 @@ -set(IDE_VERSION "4.14.1") # The IDE version. +set(IDE_VERSION "4.14.2") # The IDE version. set(IDE_VERSION_COMPAT "4.14.0") # The IDE Compatibility version. -set(IDE_VERSION_DISPLAY "4.14.1") # The IDE display version. +set(IDE_VERSION_DISPLAY "4.14.2") # The IDE display version. set(IDE_COPYRIGHT_YEAR "2020") # The IDE current copyright year. set(IDE_SETTINGSVARIANT "QtProject") # The IDE settings variation. diff --git a/qbs/modules/qtc/qtc.qbs b/qbs/modules/qtc/qtc.qbs index 3c67ce83e51..c64025f67b4 100644 --- a/qbs/modules/qtc/qtc.qbs +++ b/qbs/modules/qtc/qtc.qbs @@ -4,10 +4,10 @@ import qbs.FileInfo import "qtc.js" as HelperFunctions Module { - property string qtcreator_display_version: '4.14.1' + property string qtcreator_display_version: '4.14.2' property string ide_version_major: '4' property string ide_version_minor: '14' - property string ide_version_release: '1' + property string ide_version_release: '2' property string qtcreator_version: ide_version_major + '.' + ide_version_minor + '.' + ide_version_release diff --git a/qtcreator_ide_branding.pri b/qtcreator_ide_branding.pri index f9fbc83a83b..614b2c15721 100644 --- a/qtcreator_ide_branding.pri +++ b/qtcreator_ide_branding.pri @@ -1,6 +1,6 @@ -QTCREATOR_VERSION = 4.14.1 +QTCREATOR_VERSION = 4.14.2 QTCREATOR_COMPAT_VERSION = 4.14.0 -QTCREATOR_DISPLAY_VERSION = 4.14.1 +QTCREATOR_DISPLAY_VERSION = 4.14.2 QTCREATOR_COPYRIGHT_YEAR = 2020 IDE_DISPLAY_NAME = Qt Creator From de04f29198a602491b4195c778ce6a7f98dacf4c Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Wed, 24 Feb 2021 16:16:19 +0100 Subject: [PATCH 2/4] Squish: Wait for the docs update progress bar MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I73e80119a7e5a8d09397138d1301154af597f907 Reviewed-by: Robert Löhning --- tests/system/shared/qtcreator.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/tests/system/shared/qtcreator.py b/tests/system/shared/qtcreator.py index 76dbd7071d6..9ecec40a207 100644 --- a/tests/system/shared/qtcreator.py +++ b/tests/system/shared/qtcreator.py @@ -66,10 +66,12 @@ 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: - clickButton(waitForObject(":*Qt Creator.Do Not Show Again_QToolButton")) - if cancelTour: - clickButton(waitForObject(":*Qt Creator.Do Not Show Again_QToolButton")) + 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: + clickButton(waitForObject(":*Qt Creator.Do Not Show Again_QToolButton")) return appContext; def startedWithoutPluginError(): From 0de044d4794aff533a77f7dfe23815f9e2f4388d Mon Sep 17 00:00:00 2001 From: Heiko Becker Date: Thu, 25 Feb 2021 23:38:52 +0100 Subject: [PATCH 3/4] Use GNUInstallDirs to install desktop and appstream files c81baf1a9cc938a283f6c52c8fd10bab84183391 introduced the usage of GNUInstallDirs for Linux. Use it to install desktop files and appstream metadata, too. Change-Id: I13a363e5383e1150fd9b8d7e33d55ac53bee63ff Reviewed-by: Eike Ziller --- share/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/CMakeLists.txt b/share/CMakeLists.txt index eb3c779b400..b1e61d596ef 100644 --- a/share/CMakeLists.txt +++ b/share/CMakeLists.txt @@ -6,6 +6,6 @@ if (NOT APPLE AND NOT WIN32) applications metainfo DESTINATION - share + ${CMAKE_INSTALL_DATAROOTDIR} ) endif() From d41bc944cce5350674a34f80ec61cc20e3adeea4 Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Thu, 25 Feb 2021 15:29:40 +0200 Subject: [PATCH 4/4] Help: Fix crash with previous/next document in help mode "Previous/next Open Document in History" crashed in help mode when only a single page is open. Disable the actions in this case, and add a guard that prevents setting the current page to an invalid index. Fixes: QDS-3743 Change-Id: I569292d8c348269dd12d2ebb089c03173cbd4bc2 Reviewed-by: Eike Ziller --- src/plugins/help/helpwidget.cpp | 5 ++++- src/plugins/help/openpagesswitcher.cpp | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/plugins/help/helpwidget.cpp b/src/plugins/help/helpwidget.cpp index 65c468ac386..30a62b3381f 100644 --- a/src/plugins/help/helpwidget.cpp +++ b/src/plugins/help/helpwidget.cpp @@ -934,7 +934,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 20117828a71..5991efd0dda 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)