Merge remote-tracking branch 'origin/4.11' into 4.12

Change-Id: I7960e0df40458d1052e14c95b5556871b50159c4

3 files changed, 58 insertions, 2 deletions

diff --git a/dist/changes-4.11.2.md b/dist/changes-4.11.2.md
new file mode 100644
index 0000000000..0e0ba506a4
--- /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  
diff --git a/src/plugins/debugger/disassembleragent.cpp b/src/plugins/debugger/disassembleragent.cpp
index 0c41c1475d..97e08b47fe 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) {
diff --git a/src/plugins/projectexplorer/jsonwizard/jsonsummarypage.cpp b/src/plugins/projectexplorer/jsonwizard/jsonsummarypage.cpp
index e750dd59ea..ab99fa4de9 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();
 }