aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/genericprojectmanager/genericprojectwizard.cpp
diff options
context:
space:
mode:
authorNikolai Kosjar <nikolai.kosjar@qt.io>2019-01-11 14:10:09 +0100
committerNikolai Kosjar <nikolai.kosjar@qt.io>2019-01-15 13:33:34 +0000
commit62c8aecb5fd950a56b17483bccd176f4f77245e4 (patch)
treea77c3cdb479425b7086d72e71c713a38bafd8b91 /src/plugins/genericprojectmanager/genericprojectwizard.cpp
parenta1ae5820afa6a52ca27a5f7efb16a825673170ff (diff)
GenericProject: Support forwarding flags to clang code model
...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>
Diffstat (limited to 'src/plugins/genericprojectmanager/genericprojectwizard.cpp')
-rw-r--r--src/plugins/genericprojectmanager/genericprojectwizard.cpp11
1 files changed, 11 insertions, 0 deletions
diff --git a/src/plugins/genericprojectmanager/genericprojectwizard.cpp b/src/plugins/genericprojectmanager/genericprojectwizard.cpp
index edd55df5b6b..ce8e4034ee2 100644
--- a/src/plugins/genericprojectmanager/genericprojectwizard.cpp
+++ b/src/plugins/genericprojectmanager/genericprojectwizard.cpp
@@ -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;
}