Merge remote-tracking branch 'origin/9.0'

Change-Id: I5298a6529921568ec32c0fe0c009c273263b0f5d

src/plugins/beautifier/clangformat/clangformatoptionspage.cpp

@@ -13,6 +13,7 @@
 #include <utils/layoutbuilder.h>
 #include <utils/pathchooser.h>
 
+#include <QButtonGroup>
 #include <QComboBox>
 #include <QGroupBox>
 #include <QLabel>
@@ -47,8 +48,10 @@ ClangFormatOptionsPageWidget::ClangFormatOptionsPageWidget(ClangFormatSettings *
     auto options = new QGroupBox(tr("Options"));
     options->setEnabled(false);
 
+    auto styleButtonGroup = new QButtonGroup(this);
+
     auto useCustomizedStyle = new QRadioButton(tr("Use customized style:"));
-    useCustomizedStyle->setAutoExclusive(true);
+    styleButtonGroup->addButton(useCustomizedStyle);
 
     m_configurations = new ConfigurationPanel;
     m_configurations->setSettings(m_settings);
@@ -57,7 +60,7 @@ ClangFormatOptionsPageWidget::ClangFormatOptionsPageWidget(ClangFormatSettings *
     m_usePredefinedStyle = new QRadioButton(tr("Use predefined style:"));
 
     m_usePredefinedStyle->setChecked(true);
-    m_usePredefinedStyle->setAutoExclusive(true);
+    styleButtonGroup->addButton(m_usePredefinedStyle);
 
     m_predefinedStyle = new QComboBox;
     m_predefinedStyle->addItems(m_settings->predefinedStyles());

src/plugins/cppeditor/cppelementevaluator.cpp

@@ -184,11 +184,12 @@ void CppClass::lookupDerived(QFutureInterfaceBase &futureInterface,
 
 void CppClass::addDerivedHierarchy(const TypeHierarchy &hierarchy)
 {
-    CppClass classSymbol(hierarchy.symbol());
     const QList<TypeHierarchy> derivedHierarchies = hierarchy.hierarchy();
-    for (const TypeHierarchy &derivedHierarchy : derivedHierarchies)
+    for (const TypeHierarchy &derivedHierarchy : derivedHierarchies) {
+        CppClass classSymbol(derivedHierarchy.symbol());
         classSymbol.addDerivedHierarchy(derivedHierarchy);
-    derived.append(classSymbol);
+        derived.append(classSymbol);
+    }
 }
 
 class CppFunction : public CppDeclarableElement

src/plugins/projectexplorer/runcontrol.cpp

@@ -1319,7 +1319,11 @@ void SimpleTargetRunnerPrivate::stop()
         switch (m_state) {
             case Run:
                 m_process.stop();
-                m_process.waitForFinished();
+                if (!m_process.waitForFinished(2000)) { // TODO: it may freeze on some devices
+                    QTC_CHECK(false); // Shouldn't happen, just emergency handling
+                    m_process.close();
+                    forwardDone();
+                }
                 break;
             case Inactive:
                 break;

src/plugins/projectexplorer/toolchainoptionspage.cpp

@@ -192,6 +192,8 @@ public:
             }
         }
         m_addButton->setMenu(addMenu);
+        if (HostOsInfo::isMacHost())
+            m_addButton->setStyleSheet("text-align:center;");
 
         m_cloneButton = new QPushButton(ToolChainOptionsPage::tr("Clone"), this);
         connect(m_cloneButton, &QAbstractButton::clicked, [this] { cloneToolChain(); });

src/plugins/remotelinux/linuxdevice.cpp

@@ -490,8 +490,10 @@ bool SshProcessInterface::runInShell(const CommandLine &command, const QByteArra
     process.setCommand(cmd);
     process.setWriteData(data);
     process.start();
-    QTC_CHECK(process.waitForFinished()); // otherwise we may start producing killers for killers
-    return process.exitCode() == 0;
+    bool isFinished = process.waitForFinished(2000); // TODO: it may freeze on some devices
+    // otherwise we may start producing killers for killers
+    QTC_CHECK(isFinished);
+    return isFinished;
 }
 
 void SshProcessInterface::start()

src/plugins/texteditor/texteditor.cpp

@@ -2700,7 +2700,8 @@ void TextEditorWidget::keyPressEvent(QKeyEvent *e)
         }
         break;
     case Qt::Key_Delete:
-        if (hasMultipleCursors && !ro && e->modifiers() == Qt::NoModifier) {
+        if (hasMultipleCursors && !ro
+            && (e->modifiers() == Qt::NoModifier || e->modifiers() == Qt::KeypadModifier)) {
             if (cursor.hasSelection()) {
                 cursor.removeSelectedText();
             } else {