From 3e225628ee6967d224fcdcc30e42015c9be74862 Mon Sep 17 00:00:00 2001 From: hjk Date: Fri, 24 Feb 2017 16:09:39 +0100 Subject: Revert "Clang: Add possibility to "pgo-train" libclang with a batch file" This reverts commit 07f4ae622770cc99782edc8bf14d2a385bf17778, which broke compilation clangbatchfileprocessor.cpp:170:27: error: ambiguous overload for 'operator==' (operand types are 'const QChar' and 'char') and only worked in QT_TEST=1 cases. Change-Id: I089427359958221882cb4e4369c4b88d71779acf Reviewed-by: Tobias Hunger --- src/plugins/clangcodemodel/clangcodemodelplugin.cpp | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) (limited to 'src/plugins/clangcodemodel/clangcodemodelplugin.cpp') diff --git a/src/plugins/clangcodemodel/clangcodemodelplugin.cpp b/src/plugins/clangcodemodel/clangcodemodelplugin.cpp index 0aa9cbff3f..ba1bc10376 100644 --- a/src/plugins/clangcodemodel/clangcodemodelplugin.cpp +++ b/src/plugins/clangcodemodel/clangcodemodelplugin.cpp @@ -25,7 +25,6 @@ #include "clangcodemodelplugin.h" -#include "clangbatchfileprocessor.h" #include "clangconstants.h" #include "clangprojectsettingswidget.h" @@ -75,13 +74,8 @@ void addProjectPanelWidget() bool ClangCodeModelPlugin::initialize(const QStringList &arguments, QString *errorMessage) { - Q_UNUSED(arguments); - Q_UNUSED(errorMessage); - - connect(ProjectExplorer::ProjectExplorerPlugin::instance(), - &ProjectExplorer::ProjectExplorerPlugin::finishedInitialization, - this, - &ClangCodeModelPlugin::maybeHandleBatchFileAndExit); + Q_UNUSED(arguments) + Q_UNUSED(errorMessage) CppTools::CppModelManager::instance()->activateClangCodeModel(&m_modelManagerSupportProvider); @@ -95,16 +89,6 @@ void ClangCodeModelPlugin::extensionsInitialized() { } -// For e.g. creation of profile-guided optimization builds. -void ClangCodeModelPlugin::maybeHandleBatchFileAndExit() const -{ - const QString batchFilePath = QString::fromLocal8Bit(qgetenv("QTC_CLANG_BATCH")); - if (!batchFilePath.isEmpty() && QTC_GUARD(QFileInfo::exists(batchFilePath))) { - const bool runSucceeded = runClangBatchFile(batchFilePath); - QCoreApplication::exit(!runSucceeded); - } -} - #ifdef WITH_TESTS QList ClangCodeModelPlugin::createTestObjects() const { -- cgit v1.2.1