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

GenericProject: Support forwarding flags to clang code model

Browse Source 
...in order to specify e.g. the language version to use.

Create the additional files project.cxxflags and project.cflags. These
are expected to contain command line flags for the clang code model on
one single line.

For example, "-std=c++11" can be provided to set the language version
for parsing.

Fixes: QTCREATORBUG-19668
Change-Id: I7712f546ba1fae536c32adfa5bd449c5b3484521
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
Nikolai Kosjar
2019-01-11 14:10:09 +01:00
parent a1ae5820af
commit 62c8aecb5f
6 changed files with 79 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/genericprojectmanager/genericprojectwizard.cpp
View File

@@ -149,6 +149,8 @@ Core::GeneratedFiles GenericProjectWizard::generateFiles(const QWizard *w,
const QString filesFileName = QFileInfo(dir, projectName + QLatin1String(".files")).absoluteFilePath();
const QString includesFileName = QFileInfo(dir, projectName + QLatin1String(".includes")).absoluteFilePath();
const QString configFileName = QFileInfo(dir, projectName + QLatin1String(".config")).absoluteFilePath();
const QString cxxflagsFileName = QFileInfo(dir, projectName + QLatin1String(".cxxflags")).absoluteFilePath();
const QString cflagsFileName = QFileInfo(dir, projectName + QLatin1String(".cflags")).absoluteFilePath();
const QStringList paths = Utils::transform(wizard->selectedPaths(), &Utils::FileName::toString);
Utils::MimeType headerTy = Utils::mimeTypeForName(QLatin1String("text/x-chdr"));
@@ -188,11 +190,20 @@ Core::GeneratedFiles GenericProjectWizard::generateFiles(const QWizard *w,
Core::GeneratedFile generatedConfigFile(configFileName);
generatedConfigFile.setContents(QLatin1String(ConfigFileTemplate));
Core::GeneratedFile generatedCxxFlagsFile(cxxflagsFileName);
generatedCxxFlagsFile.setContents(
QLatin1String(Constants::GENERICPROJECT_CXXFLAGS_FILE_TEMPLATE));
Core::GeneratedFile generatedCFlagsFile(cflagsFileName);
generatedCFlagsFile.setContents(QLatin1String(Constants::GENERICPROJECT_CFLAGS_FILE_TEMPLATE));
Core::GeneratedFiles files;
files.append(generatedFilesFile);
files.append(generatedIncludesFile);
files.append(generatedConfigFile);
files.append(generatedCreatorFile);
files.append(generatedCxxFlagsFile);
files.append(generatedCFlagsFile);
return files;
}