summaryrefslogtreecommitdiff
path: root/src/plugins/cpptools/baseeditordocumentparser.h
diff options
context:
space:
mode:
authorNikolai Kosjar <nikolai.kosjar@qt.io>2017-01-12 18:01:12 +0100
committerNikolai Kosjar <nikolai.kosjar@qt.io>2017-01-16 10:17:50 +0000
commite4e65726614fa4e3ee02f25db755d959850441ea (patch)
treea76a4aab899eb313f25f0da8a1f3e89ede71b67b /src/plugins/cpptools/baseeditordocumentparser.h
parent4416eecc024e155438c7ed6399182dbff143bd0d (diff)
downloadqt-creator-e4e65726614fa4e3ee02f25db755d959850441ea.tar.gz
CppTools: Allow interpreting ambiguous headers as C headers
...instead of C++ headers. For the Clang Code Model this results in using "-x c-header" instead of "-x c++-header". This introduces a new option in Options > C++ > "Code Model" to configure this. Change-Id: I8a0ce8fa6155f5ef58743ebc7f1d0b500fbf6599 Reviewed-by: David Schulz <david.schulz@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Diffstat (limited to 'src/plugins/cpptools/baseeditordocumentparser.h')
-rw-r--r--src/plugins/cpptools/baseeditordocumentparser.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/plugins/cpptools/baseeditordocumentparser.h b/src/plugins/cpptools/baseeditordocumentparser.h
index 11f76fa67d..92f919e96d 100644
--- a/src/plugins/cpptools/baseeditordocumentparser.h
+++ b/src/plugins/cpptools/baseeditordocumentparser.h
@@ -25,6 +25,7 @@
#pragma once
+#include "cpplanguage.h"
#include "cpptools_global.h"
#include "cppworkingcopy.h"
#include "projectpart.h"
@@ -55,15 +56,18 @@ public:
struct UpdateParams {
UpdateParams(const WorkingCopy &workingCopy,
const ProjectExplorer::Project *activeProject,
+ Language languagePreference,
bool hasActiveProjectChanged)
: workingCopy(workingCopy)
, activeProject(activeProject)
+ , languagePreference(languagePreference)
, hasActiveProjectChanged(hasActiveProjectChanged)
{
}
WorkingCopy workingCopy;
const ProjectExplorer::Project *activeProject = nullptr;
+ Language languagePreference = Language::Cxx;
bool hasActiveProjectChanged = false;
};
@@ -92,6 +96,7 @@ protected:
const Configuration &config,
const State &state,
const ProjectExplorer::Project *activeProject,
+ Language languagePreference,
bool hasActiveProjectChanged);
mutable QMutex m_stateAndConfigurationMutex;