From a7c05e5e113e9b10e09d395cfc0686ded9356453 Mon Sep 17 00:00:00 2001 From: hjk Date: Fri, 6 Mar 2020 10:15:26 +0100 Subject: [PATCH 1/3] Debugger: Invalidate disassembler cache index after using it Not before. Amends b3812bf94f. Change-Id: I3f8dd9f23adbbd56bb0d5d76a80a90fd9b7030b5 Reviewed-by: Christian Stenger --- src/plugins/debugger/disassembleragent.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/debugger/disassembleragent.cpp b/src/plugins/debugger/disassembleragent.cpp index d8a083b8d53..ff958b5d7af 100644 --- a/src/plugins/debugger/disassembleragent.cpp +++ b/src/plugins/debugger/disassembleragent.cpp @@ -238,8 +238,8 @@ void DisassemblerAgent::setLocation(const Location &loc) // Refresh when not displaying a function and there is not sufficient // context left past the address. if (d->cache.at(index).first.endAddress - loc.address() < 24) { - index = -1; d->cache.removeAt(index); + index = -1; } } if (index != -1) { From 7f1c1baf8c5c88cd4c40cffd35299bde3c915c72 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Mon, 9 Mar 2020 12:46:15 +0100 Subject: [PATCH 2/3] ProjectExplorer: Register the "QtKeywordsEnabled" macro in time It was used in the header template before we made it known to the wizard. Fixes: QTCREATORBUG-23603 Change-Id: I4b0f77c199aa22cc1b9853657695cdb10b96faad Reviewed-by: Eike Ziller --- src/plugins/projectexplorer/jsonwizard/jsonsummarypage.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/plugins/projectexplorer/jsonwizard/jsonsummarypage.cpp b/src/plugins/projectexplorer/jsonwizard/jsonsummarypage.cpp index e750dd59ea5..ab99fa4de97 100644 --- a/src/plugins/projectexplorer/jsonwizard/jsonsummarypage.cpp +++ b/src/plugins/projectexplorer/jsonwizard/jsonsummarypage.cpp @@ -49,6 +49,7 @@ static char KEY_SELECTED_PROJECT[] = "SelectedProject"; static char KEY_SELECTED_NODE[] = "SelectedFolderNode"; static char KEY_IS_SUBPROJECT[] = "IsSubproject"; static char KEY_VERSIONCONTROL[] = "VersionControl"; +static char KEY_QT_KEYWORDS_ENABLED[] = "QtKeywordsEnabled"; namespace ProjectExplorer { @@ -105,6 +106,7 @@ void JsonSummaryPage::initializePage() m_wizard->setValue(QLatin1String(KEY_SELECTED_NODE), QVariant()); m_wizard->setValue(QLatin1String(KEY_IS_SUBPROJECT), false); m_wizard->setValue(QLatin1String(KEY_VERSIONCONTROL), QString()); + m_wizard->setValue(QLatin1String(KEY_QT_KEYWORDS_ENABLED), false); connect(m_wizard, &JsonWizard::filesReady, this, &JsonSummaryPage::triggerCommit); connect(m_wizard, &JsonWizard::filesReady, this, &JsonSummaryPage::addToProject); @@ -270,7 +272,7 @@ void JsonSummaryPage::updateProjectData(FolderNode *node) projectNode = projectNode->parentProjectNode(); } } - m_wizard->setValue("QtKeywordsEnabled", qtKeyWordsEnabled); + m_wizard->setValue(QLatin1String(KEY_QT_KEYWORDS_ENABLED), qtKeyWordsEnabled); updateFileList(); } From 7c7c5d5a4fb5011aa1328508943b7d2d50874b07 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Mon, 9 Mar 2020 16:12:49 +0100 Subject: [PATCH 3/3] Add changes file for 4.11.2 Change-Id: I6bd6bc3e682c13ca562bcf33f458444e8f74b353 Reviewed-by: Leena Miettinen --- dist/changes-4.11.2.md | 54 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 dist/changes-4.11.2.md diff --git a/dist/changes-4.11.2.md b/dist/changes-4.11.2.md new file mode 100644 index 00000000000..0e0ba506a42 --- /dev/null +++ b/dist/changes-4.11.2.md @@ -0,0 +1,54 @@ +Qt Creator 4.11.2 +================= + +Qt Creator version 4.11.2 contains bug fixes. + +The most important changes are listed in this document. For a complete +list of changes, see the Git log for the Qt Creator sources that +you can check out from the public Git repository. For example: + + git clone git://code.qt.io/qt-creator/qt-creator.git + git log --cherry-pick --pretty=oneline origin/v4.11.1..v4.11.2 + +Editing +------- + +* Improved performance of highlighting (QTCREATORBUG-23281) +* Fixed that `Rewrap Paragraph` split on non-breaking space (QTCREATORBUG-23643) +* Fixed freeze with block selection (QTCREATORBUG-23622) +* Fixed high CPU usage after scrolling horizontally (QTCREATORBUG-23647) +* Fixed scroll position after splitting if text cursor is not visible +* Fixed position of markers in scrollbar for long documents (QTCREATORBUG-23660) + +### Python + +* Fixed warnings in files generated by Python file wizard + +### Language Client + +* Fixed issue with server restart after server crash (QTCREATORBUG-23648) + +Projects +-------- + +* Fixed wrong default project for adding files via wizards (QTCREATORBUG-23603) + +Platforms +--------- + +### macOS + +* Fixed issues with notarization of binary package + +Credits for these changes go to: +-------------------------------- + +André Pönitz +Andy Shaw +Christian Kandeler +David Schulz +Eike Ziller +Leena Miettinen +Orgad Shaneh +Richard Weickelt +Tobias Hunger