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

Enable macro editing for the Clang indexer

Browse Source 
Refactor much of the code from Environment* classes to NameValue* classes
to share it with the preprocessor macro settings.

Change-Id: Ica4ee817aa338230c422b30d91240d266248d226
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Marco Bubke
2019-05-07 16:51:22 +02:00
parent f636f06b45
commit 4bae5de36b
84 changed files with 2990 additions and 1197 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qmlprojectmanager/fileformat/qmlprojectitem.cpp
View File

@@ -98,7 +98,7 @@ bool QmlProjectItem::matchesFile(const QString &filePath) const
return false;
}
QList<Utils::EnvironmentItem> QmlProjectItem::environment() const
Utils::EnvironmentItems QmlProjectItem::environment() const
{
return m_environment;
}

4
src/plugins/qmlprojectmanager/fileformat/qmlprojectitem.h
View File

@@ -65,7 +65,7 @@ public:
void appendContent(QmlProjectContentItem *item) { m_content.append(item); }
QList<Utils::EnvironmentItem> environment() const;
Utils::EnvironmentItems environment() const;
void addToEnviroment(const QString &key, const QString &value);
signals:
@@ -77,7 +77,7 @@ protected:
QStringList m_importPaths;
QStringList m_fileSelectors;
QString m_mainFile;
QList<Utils::EnvironmentItem> m_environment;
Utils::EnvironmentItems m_environment;
QList<QmlProjectContentItem *> m_content; // content property
};

2
src/plugins/qmlprojectmanager/qmlproject.cpp
View File

@@ -206,7 +206,7 @@ Utils::FilePath QmlProject::targetFile(const Utils::FilePath &sourceFile,
return Utils::FilePath::fromString(QDir::cleanPath(targetDir.absoluteFilePath(relative)));
}
QList<Utils::EnvironmentItem> QmlProject::environment() const
Utils::EnvironmentItems QmlProject::environment() const
{
if (m_projectItem)
return m_projectItem.data()->environment();

2
src/plugins/qmlprojectmanager/qmlproject.h
View File

@@ -69,7 +69,7 @@ public:
Utils::FilePath targetFile(const Utils::FilePath &sourceFile,
const ProjectExplorer::Target *target) const;
QList<Utils::EnvironmentItem> environment() const;
Utils::EnvironmentItems environment() const;
QStringList customImportPaths() const;
QStringList customFileSelectors() const;