Merge remote-tracking branch 'origin/4.15'

Change-Id: Ia6558fc2423fd9cd84ca2282bfa60d102dff682e

10 files changed, 78 insertions, 26 deletions

diff --git a/src/plugins/coreplugin/externaltool.cpp b/src/plugins/coreplugin/externaltool.cpp
index dc5a7f009e..ceaa1465e4 100644
--- a/src/plugins/coreplugin/externaltool.cpp
+++ b/src/plugins/coreplugin/externaltool.cpp
@@ -666,7 +666,10 @@ void ExternalToolRunner::run()
     const CommandLine cmd{m_resolvedExecutable, m_resolvedArguments, CommandLine::Raw};
     m_process->setCommand(cmd);
     m_process->setEnvironment(m_resolvedEnvironment);
-    MessageManager::writeDisrupting(tr("Starting external tool \"%1\"").arg(cmd.toUserOutput()));
+    const auto write = m_tool->outputHandling() == ExternalTool::ShowInPane
+                           ? QOverload<const QString &>::of(MessageManager::writeDisrupting)
+                           : QOverload<const QString &>::of(MessageManager::writeSilently);
+    write(tr("Starting external tool \"%1\"").arg(cmd.toUserOutput()));
     m_process->start();
 }
 
@@ -686,7 +689,10 @@ void ExternalToolRunner::finished(int exitCode, QProcess::ExitStatus status)
     }
     if (m_tool->modifiesCurrentDocument())
         DocumentManager::unexpectFileChange(m_expectedFileName);
-    MessageManager::writeFlashing(tr("\"%1\" finished").arg(m_resolvedExecutable.toUserOutput()));
+    const auto write = m_tool->outputHandling() == ExternalTool::ShowInPane
+                           ? QOverload<const QString &>::of(MessageManager::writeFlashing)
+                           : QOverload<const QString &>::of(MessageManager::writeSilently);
+    write(tr("\"%1\" finished").arg(m_resolvedExecutable.toUserOutput()));
     deleteLater();
 }
 
diff --git a/src/plugins/cpptools/cpptoolstestcase.cpp b/src/plugins/cpptools/cpptoolstestcase.cpp
index 7c138a1416..8a714b7df7 100644
--- a/src/plugins/cpptools/cpptoolstestcase.cpp
+++ b/src/plugins/cpptools/cpptoolstestcase.cpp
@@ -234,8 +234,9 @@ bool TestCase::waitUntilProjectIsFullyOpened(Project *project, int timeOutInMs)
 
     return QTest::qWaitFor(
         [project]() {
-            return !SessionManager::startupBuildSystem()->isParsing()
-                   && CppModelManager::instance()->projectInfo(project).isValid();
+            return SessionManager::startupBuildSystem()
+                    && !SessionManager::startupBuildSystem()->isParsing()
+                    && CppModelManager::instance()->projectInfo(project).isValid();
         },
         timeOutInMs);
 }
diff --git a/src/plugins/projectexplorer/msvctoolchain.cpp b/src/plugins/projectexplorer/msvctoolchain.cpp
index 48636393d9..892a8421d5 100644
--- a/src/plugins/projectexplorer/msvctoolchain.cpp
+++ b/src/plugins/projectexplorer/msvctoolchain.cpp
@@ -1470,9 +1470,9 @@ void ClangClToolChainConfigWidget::setFromClangClToolChain()
 
     const auto *clangClToolChain = static_cast<const ClangClToolChain *>(toolChain());
     if (clangClToolChain->isAutoDetected())
-        m_llvmDirLabel->setText(clangClToolChain->compilerCommand().toUserOutput());
+        m_llvmDirLabel->setText(QDir::toNativeSeparators(clangClToolChain->clangPath()));
     else
-        m_compilerCommand->setFilePath(clangClToolChain->compilerCommand());
+        m_compilerCommand->setFilePath(Utils::FilePath::fromString(clangClToolChain->clangPath()));
 }
 
 static const MsvcToolChain *findMsvcToolChain(unsigned char wordWidth, Abi::OSFlavor flavor)
@@ -1569,7 +1569,7 @@ static QList<ToolChain *> detectClangClToolChainInPath(const QString &clangClPat
             res << tc;
         } else {
             auto cltc = new ClangClToolChain;
-            cltc->setCompilerCommand(FilePath::fromString(clangClPath));
+            cltc->setClangPath(clangClPath);
             cltc->setDisplayName(name);
             cltc->setDetection(ToolChain::AutoDetection);
             cltc->setLanguage(language);
@@ -1587,18 +1587,18 @@ static QString compilerFromPath(const QString &path)
 
 void ClangClToolChainConfigWidget::applyImpl()
 {
-    FilePath compilerCommand = m_compilerCommand->filePath();
+    Utils::FilePath clangClPath = m_compilerCommand->filePath();
     auto clangClToolChain = static_cast<ClangClToolChain *>(toolChain());
-    clangClToolChain->setCompilerCommand(compilerCommand);
+    clangClToolChain->setClangPath(clangClPath.toString());
 
-    if (compilerCommand.fileName() != "clang-cl.exe") {
+    if (clangClPath.fileName() != "clang-cl.exe") {
         clangClToolChain->resetVarsBat();
         setFromClangClToolChain();
         return;
     }
 
     const QString displayedVarsBat = m_varsBatDisplayCombo->currentText();
-    QList<ToolChain *> results = detectClangClToolChainInPath(compilerCommand.toString(),
+    QList<ToolChain *> results = detectClangClToolChainInPath(clangClPath.toString(),
                                                               {},
                                                               displayedVarsBat);
 
@@ -1638,22 +1638,26 @@ ClangClToolChain::ClangClToolChain()
 {
     setDisplayName("clang-cl");
     setTypeDisplayName(QCoreApplication::translate("ProjectExplorer::ClangToolChainFactory", "Clang"));
-    setCompilerCommandKey("ProjectExplorer.ClangClToolChain.LlvmDir");
 }
 
 bool ClangClToolChain::isValid() const
 {
-    return MsvcToolChain::isValid() && compilerCommand().exists()
-           && compilerCommand().fileName() == "clang-cl.exe";
+    const QFileInfo fi(clangPath());
+    return MsvcToolChain::isValid() && fi.exists() && fi.fileName() == "clang-cl.exe";
 }
 
 void ClangClToolChain::addToEnvironment(Utils::Environment &env) const
 {
     MsvcToolChain::addToEnvironment(env);
-    QDir path = compilerCommand().toFileInfo().absoluteDir(); // bin folder
+    QDir path = QFileInfo(m_clangPath).absoluteDir(); // bin folder
     env.prependOrSetPath(path.canonicalPath());
 }
 
+Utils::FilePath ClangClToolChain::compilerCommand() const
+{
+    return Utils::FilePath::fromString(m_clangPath);
+}
+
 QStringList ClangClToolChain::suggestedMkspecList() const
 {
     const QString mkspec = "win32-clang-" + Abi::toString(targetAbi().osFlavor());
@@ -1665,11 +1669,44 @@ QList<OutputLineParser *> ClangClToolChain::createOutputParsers() const
     return {new ClangClParser};
 }
 
+static inline QString llvmDirKey()
+{
+    return QStringLiteral("ProjectExplorer.ClangClToolChain.LlvmDir");
+}
+
+QVariantMap ClangClToolChain::toMap() const
+{
+    QVariantMap result = MsvcToolChain::toMap();
+    result.insert(llvmDirKey(), m_clangPath);
+    return result;
+}
+
+bool ClangClToolChain::fromMap(const QVariantMap &data)
+{
+    if (!MsvcToolChain::fromMap(data))
+        return false;
+    const QString clangPath = data.value(llvmDirKey()).toString();
+    if (clangPath.isEmpty())
+        return false;
+    m_clangPath = clangPath;
+
+    return true;
+}
+
 std::unique_ptr<ToolChainConfigWidget> ClangClToolChain::createConfigurationWidget()
 {
     return std::make_unique<ClangClToolChainConfigWidget>(this);
 }
 
+bool ClangClToolChain::operator==(const ToolChain &other) const
+{
+    if (!MsvcToolChain::operator==(other))
+        return false;
+
+    const auto *clangClTc = static_cast<const ClangClToolChain *>(&other);
+    return m_clangPath == clangClTc->m_clangPath;
+}
+
 Macros ClangClToolChain::msvcPredefinedMacros(const QStringList &cxxflags,
                                               const Utils::Environment &env) const
 {
@@ -1683,7 +1720,7 @@ Macros ClangClToolChain::msvcPredefinedMacros(const QStringList &cxxflags,
     QStringList arguments = cxxflags;
     arguments.append(gccPredefinedMacrosOptions(language()));
     arguments.append("-");
-    cpp.runBlocking({compilerCommand(), arguments});
+    cpp.runBlocking({clangPath(), arguments});
     if (cpp.result() != Utils::QtcProcess::Finished || cpp.exitCode() != 0) {
         // Show the warning but still parse the output.
         QTC_CHECK(false && "clang-cl exited with non-zero code.");
diff --git a/src/plugins/projectexplorer/msvctoolchain.h b/src/plugins/projectexplorer/msvctoolchain.h
index 7dce6712e1..c5269b1646 100644
--- a/src/plugins/projectexplorer/msvctoolchain.h
+++ b/src/plugins/projectexplorer/msvctoolchain.h
@@ -164,18 +164,28 @@ public:
     bool isValid() const override;
     QStringList suggestedMkspecList() const override;
     void addToEnvironment(Utils::Environment &env) const override;
+    Utils::FilePath compilerCommand() const override; // FIXME: Remove
     QList<Utils::OutputLineParser *> createOutputParsers() const override;
+    QVariantMap toMap() const override;
+    bool fromMap(const QVariantMap &data) override;
     std::unique_ptr<ToolChainConfigWidget> createConfigurationWidget() override;
     BuiltInHeaderPathsRunner createBuiltInHeaderPathsRunner(
             const Utils::Environment &env) const override;
 
     const QList<MsvcToolChain *> &msvcToolchains() const;
+    QString clangPath() const { return m_clangPath; }
+    void setClangPath(const QString &path) { m_clangPath = path; }
 
     Macros msvcPredefinedMacros(const QStringList &cxxflags,
                                 const Utils::Environment &env) const override;
     Utils::LanguageVersion msvcLanguageVersion(const QStringList &cxxflags,
                                                const Utils::Id &language,
                                                const Macros &macros) const override;
+
+    bool operator==(const ToolChain &) const override;
+
+private:
+    QString m_clangPath;
 };
 
 // --------------------------------------------------------------------------
diff --git a/src/plugins/projectexplorer/toolchain.cpp b/src/plugins/projectexplorer/toolchain.cpp
index ff2a827dcb..98df39036a 100644
--- a/src/plugins/projectexplorer/toolchain.cpp
+++ b/src/plugins/projectexplorer/toolchain.cpp
@@ -279,14 +279,7 @@ void ToolChain::toolChainUpdated()
 
 void ToolChain::setDetection(ToolChain::Detection de)
 {
-    if (d->m_detection == de)
-        return;
-    if (d->m_detection == ToolChain::UninitializedDetection) {
-        d->m_detection = de;
-    } else {
-        d->m_detection = de;
-        toolChainUpdated();
-    }
+    d->m_detection = de;
 }
 
 QString ToolChain::typeDisplayName() const
diff --git a/src/plugins/projectexplorer/toolchain.h b/src/plugins/projectexplorer/toolchain.h
index 40c9db98b2..2c2a3c68b7 100644
--- a/src/plugins/projectexplorer/toolchain.h
+++ b/src/plugins/projectexplorer/toolchain.h
@@ -146,7 +146,7 @@ public:
 
     Utils::Id language() const;
 
-    Utils::FilePath compilerCommand() const;
+    virtual Utils::FilePath compilerCommand() const; // FIXME: De-virtualize.
     void setCompilerCommand(const Utils::FilePath &command);
 
     virtual QList<Utils::OutputLineParser *> createOutputParsers() const = 0;
diff --git a/src/plugins/qmldesigner/CMakeLists.txt b/src/plugins/qmldesigner/CMakeLists.txt
index 2b26ad383f..e79c69ea6c 100644
--- a/src/plugins/qmldesigner/CMakeLists.txt
+++ b/src/plugins/qmldesigner/CMakeLists.txt
@@ -16,6 +16,7 @@ add_qtc_plugin(QmlDesigner
   PLUGIN_DEPENDS
     Core ProjectExplorer QmlJSEditor QmakeProjectManager QmlProjectManager
     QtSupport TextEditor
+  PLUGIN_RECOMMENDS QmlPreview
   SOURCES
     designersettings.cpp designersettings.h
     designmodecontext.cpp designmodecontext.h
diff --git a/src/plugins/resourceeditor/qrceditor/resourcefile.cpp b/src/plugins/resourceeditor/qrceditor/resourcefile.cpp
index a16223eb60..9cb8dd1e79 100644
--- a/src/plugins/resourceeditor/qrceditor/resourcefile.cpp
+++ b/src/plugins/resourceeditor/qrceditor/resourcefile.cpp
@@ -190,6 +190,7 @@ Core::IDocument::OpenResult ResourceFile::load()
             const QString alias = felt.attribute(QLatin1String("alias"));
             File * const file = new File(p, fileName, alias);
             file->compress = felt.attribute(QLatin1String("compress"));
+            file->compressAlgo = felt.attribute(QLatin1String("compress-algo"));
             file->threshold = felt.attribute(QLatin1String("threshold"));
             p->file_list.append(file);
         }
@@ -226,6 +227,8 @@ QString ResourceFile::contents() const
                 felt.setAttribute(QLatin1String("alias"), file.alias);
             if (!file.compress.isEmpty())
                 felt.setAttribute(QLatin1String("compress"), file.compress);
+            if (!file.compressAlgo.isEmpty())
+                felt.setAttribute(QLatin1String("compress-algo"), file.compressAlgo);
             if (!file.threshold.isEmpty())
                 felt.setAttribute(QLatin1String("threshold"), file.threshold);
         }
diff --git a/src/plugins/resourceeditor/qrceditor/resourcefile_p.h b/src/plugins/resourceeditor/qrceditor/resourcefile_p.h
index 0afb55290c..a48fa402f1 100644
--- a/src/plugins/resourceeditor/qrceditor/resourcefile_p.h
+++ b/src/plugins/resourceeditor/qrceditor/resourcefile_p.h
@@ -84,6 +84,7 @@ public:
 
     // not used, only loaded and saved
     QString compress;
+    QString compressAlgo;
     QString threshold;
 
 private:
diff --git a/src/plugins/texteditor/codeassist/codeassistant.cpp b/src/plugins/texteditor/codeassist/codeassistant.cpp
index 7439980df3..0614fbd2c7 100644
--- a/src/plugins/texteditor/codeassist/codeassistant.cpp
+++ b/src/plugins/texteditor/codeassist/codeassistant.cpp
@@ -482,7 +482,7 @@ void CodeAssistantPrivate::destroyContext()
         cancelCurrentRequest();
     } else if (m_proposalWidget) {
         m_editorWidget->keepAutoCompletionHighlight(false);
-        if (m_proposalWidget->isVisible())
+        if (m_proposalWidget->proposalIsVisible())
             m_proposalWidget->closeProposal();
         disconnect(m_proposalWidget, &QObject::destroyed,
                    this, &CodeAssistantPrivate::finalizeProposal);