Merge remote-tracking branch 'origin/14.0'

Change-Id: I7ef80fb26e623dd95c78ca3d1d3ad2d844b06333

doc/qtcreatordev/src/qtcreator-dev.qdoc

@@ -243,7 +243,7 @@
             \endlist
         \li Reference
             \list
-                \li \l{http://standards.freedesktop.org/shared-mime-info-spec/shared-mime-info-spec-latest.html}
+                \li \l{https://specifications.freedesktop.org/shared-mime-info-spec/latest/}
                     {MIME Type Specification Files}
                 \li \l{External Tool Specification Files}
                 \li \l{http://kate-editor.org/2005/03/24/writing-a-syntax-highlighting-file/}

src/plugins/coreplugin/editormanager/editormanager.cpp

@@ -1902,6 +1902,18 @@ void EditorManagerPrivate::addEditorArea(EditorArea *area)
             };
             if (isReallyVisibile(area))
                 return;
+
+            // Hack for the case that the hidden area has the current editor,
+            // and that is currently shown in Design mode. We may not switch the
+            // current editor (so not switch the current view) in that case.
+            // QTCREATORBUG-31378
+            // It would be good if the Design mode didn't rely on the current
+            // editor, instead.
+            if (area->currentView() == currentEditorView()
+                && ModeManager::currentModeId() == Constants::MODE_DESIGN) {
+                return;
+            }
+
             // In case the hidden editor area has the current view, look for a view
             // that is not hidden, iterating through the history of current views.
             // This could be the first==current view (which results in a no-op).

src/plugins/coreplugin/generalsettings.cpp

@@ -239,6 +239,10 @@ void GeneralSettingsWidget::fillLanguageBox() const
         QStringList(QLatin1String("qtcreator*.qm")));
     for (const FilePath &languageFile : languageFiles) {
         const QString name = languageFile.fileName();
+        // Ignore english ts file that is for temporary spelling fixes only.
+        // We have the "English" item that is explicitly added at the top.
+        if (name == "qtcreator_en.qm")
+            continue;
         int start = name.indexOf('_') + 1;
         int end = name.lastIndexOf('.');
         const QString locale = name.mid(start, end - start);

src/plugins/designer/qtcreatorintegration.cpp

@@ -825,7 +825,7 @@ void QtCreatorIntegration::handleSymbolRenameStage2(
             Symbol * const symbol = scope->memberAt(i);
             if (const Scope * const s = symbol->asScope())
                 scopes << s;
-            if (symbol->asNamespace())
+            if (symbol->asNamespace() || !symbol->name())
                 continue;
             qCDebug(log) << '\t' << Overview().prettyName(symbol->name());
             if (!symbol->name()->match(&oldIdentifier))

src/plugins/qmljseditor/qmltaskmanager.cpp

@@ -112,18 +112,13 @@ void QmlTaskManager::updateMessages()
     m_updateDelay.start();
 }
 
-void QmlTaskManager::updateSemanticMessagesNow()
-{
-    updateMessagesNow(true);
-}
-
 static void triggerQmllintCMakeTarget()
 {
     if (ProjectManager::startupProject())
         ProjectManager::startupProject()->buildTarget(Constants::QMLLINT_BUILD_TARGET);
 }
 
-void QmlTaskManager::updateMessagesNow(bool updateSemantic)
+void QmlTaskManager::updateSemanticMessagesNow()
 {
     // heuristic: qmllint will output meaningful warnings if qmlls is enabled
     if (QmllsSettingsManager::instance()->useQmlls()) {
@@ -134,6 +129,11 @@ void QmlTaskManager::updateMessagesNow(bool updateSemantic)
         return;
     }
 
+    updateMessagesNow(true);
+}
+
+void QmlTaskManager::updateMessagesNow(bool updateSemantic)
+{
     // clear out the qmllint warnings when qmlls was disabled after being enabled
     TaskHub::clearTasks(ProjectExplorer::Constants::TASK_CATEGORY_COMPILE);
 

tests/system/suite_general/tst_default_settings/test.py

@@ -311,11 +311,18 @@ def __getExpectedDebuggers__():
 def __getCDB__():
     result = []
     possibleLocations = ["C:\\Program Files\\Debugging Tools for Windows (x64)",
+                         "C:\\Program Files (x86)\\Debugging Tools for Windows (x86)",
+                         "C:\\Program Files (x86)\\Windows Kits\\8.0\\Debuggers\\x86",
                          "C:\\Program Files (x86)\\Windows Kits\\8.0\\Debuggers\\x64",
+                         "C:\\Program Files\\Windows Kits\\8.0\\Debuggers\\x86",
                          "C:\\Program Files\\Windows Kits\\8.0\\Debuggers\\x64",
+                         "C:\\Program Files (x86)\\Windows Kits\\8.1\\Debuggers\\x86",
                          "C:\\Program Files (x86)\\Windows Kits\\8.1\\Debuggers\\x64",
+                         "C:\\Program Files\\Windows Kits\\8.1\\Debuggers\\x86",
                          "C:\\Program Files\\Windows Kits\\8.1\\Debuggers\\x64",
+                         "C:\\Program Files (x86)\\Windows Kits\\10\\Debuggers\\x86",
                          "C:\\Program Files (x86)\\Windows Kits\\10\\Debuggers\\x64",
+                         "C:\\Program Files\\Windows Kits\\10\\Debuggers\\x86",
                          "C:\\Program Files\\Windows Kits\\10\\Debuggers\\x64"]
     for cdbPath in possibleLocations:
         cdb = os.path.join(cdbPath, "cdb.exe")