feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/4.6'

Browse Source 
Conflicts:
	src/libs/utils/settingsaccessor.cpp
	src/plugins/autotest/autotestplugin.cpp
	src/plugins/git/gitclient.cpp
	src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp
	src/plugins/qbsprojectmanager/qbsrunconfiguration.h

Change-Id: I65f143cad18af509a2621d6c5925abbd038ea70f
This commit is contained in:
Eike Ziller
2018-04-13 10:54:42 +02:00
parent 9e29a32e1a f4594c922f
commit 428fcb476b
61 changed files with 1137 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp
View File

@@ -448,6 +448,7 @@ public:
, m_projectPart(projectPart)
{
addLanguageOptions();
addGlobalDiagnosticOptions(); // Before addDiagnosticOptions() so users still can overwrite.
addDiagnosticOptions();
addGlobalOptions();
addPrecompiledHeaderOptions();
@@ -546,6 +547,15 @@ private:
addXclangArg("-plugin-arg-clang-lazy", "ignore-included-files");
}
void addGlobalDiagnosticOptions()
{
m_options.append({
// Avoid undesired warnings from e.g. Q_OBJECT
QStringLiteral("-Wno-unknown-pragmas"),
QStringLiteral("-Wno-unknown-warning-option")
});
}
void addGlobalOptions()
{
if (!m_projectPart.project)