diff options
Diffstat (limited to 'src/plugins/cppeditor')
| -rw-r--r-- | src/plugins/cppeditor/cppeditorwidget.cpp | 6 | ||||
| -rw-r--r-- | src/plugins/cppeditor/cppmodelmanager.cpp | 9 |
2 files changed, 6 insertions, 9 deletions
diff --git a/src/plugins/cppeditor/cppeditorwidget.cpp b/src/plugins/cppeditor/cppeditorwidget.cpp index e2bd2ef93e5..03d8e295324 100644 --- a/src/plugins/cppeditor/cppeditorwidget.cpp +++ b/src/plugins/cppeditor/cppeditorwidget.cpp @@ -782,10 +782,8 @@ void CppEditorWidget::showRenameWarningIfFileIsGenerated(const Utils::FilePath & "This is normally not a good idea, as the file will likely get " "overwritten during the build process.") .arg(filePath.toUserOutput()); - if (const Target * const target = project->activeTarget()) { - if (const BuildSystem * const bs = target->buildSystem()) - ec = bs->extraCompilerForTarget(filePath); - } + if (const BuildSystem * const bs = project->activeBuildSystem()) + ec = bs->extraCompilerForTarget(filePath); if (ec) { warning.append('\n').append(CppEditor::Tr::tr( "Do you want to edit \"%1\" instead?") diff --git a/src/plugins/cppeditor/cppmodelmanager.cpp b/src/plugins/cppeditor/cppmodelmanager.cpp index 0e9f344ed1e..8ce2cb6f3e3 100644 --- a/src/plugins/cppeditor/cppmodelmanager.cpp +++ b/src/plugins/cppeditor/cppmodelmanager.cpp @@ -416,8 +416,7 @@ void CppModelManager::showPreprocessedFile(bool inNextSplit) } const Project * const project = ProjectTree::currentProject(); - if (!project || !project->activeTarget() - || !project->activeTarget()->activeBuildConfiguration()) { + if (!project || !project->activeBuildConfiguration()) { showFallbackWarning(Tr::tr("Could not determine which compiler to invoke.")); useBuiltinPreprocessor(); return; @@ -426,9 +425,9 @@ void CppModelManager::showPreprocessedFile(bool inNextSplit) const Toolchain * tc = nullptr; const ProjectFile classifier(filePath, ProjectFile::classify(filePath.toUrlishString())); if (classifier.isC()) { - tc = ToolchainKitAspect::cToolchain(project->activeTarget()->kit()); + tc = ToolchainKitAspect::cToolchain(project->activeKit()); } else if (classifier.isCxx() || classifier.isHeader()) { - tc = ToolchainKitAspect::cxxToolchain(project->activeTarget()->kit()); + tc = ToolchainKitAspect::cxxToolchain(project->activeKit()); } else { showFallbackWarning(Tr::tr("Could not determine which compiler to invoke.")); useBuiltinPreprocessor(); @@ -468,7 +467,7 @@ void CppModelManager::showPreprocessedFile(bool inNextSplit) const CommandLine compilerCommandLine(tc->compilerCommand(), compilerArgs); const auto compiler = new Process(instance()); compiler->setCommand(compilerCommandLine); - compiler->setEnvironment(project->activeTarget()->activeBuildConfiguration()->environment()); + compiler->setEnvironment(project->activeBuildConfiguration()->environment()); connect(compiler, &Process::done, instance(), [compiler, outFilePath, inNextSplit, useBuiltinPreprocessor, isMsvc] { compiler->deleteLater(); |