diff options
| author | Marco Bubke <marco.bubke@qt.io> | 2019-05-07 16:51:22 +0200 |
|---|---|---|
| committer | Marco Bubke <marco.bubke@qt.io> | 2019-06-13 16:51:48 +0000 |
| commit | 4bae5de36b530bbef06ec7cb1fbfb7453fd59dc7 (patch) | |
| tree | e8631b82915aef669fd63e6b0a72a1088185fa7e /src/plugins/qmlprojectmanager | |
| parent | f636f06b458782289340a61e42e6bbc1e523f937 (diff) | |
Enable macro editing for the Clang indexer
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>
Diffstat (limited to 'src/plugins/qmlprojectmanager')
4 files changed, 5 insertions, 5 deletions
diff --git a/src/plugins/qmlprojectmanager/fileformat/qmlprojectitem.cpp b/src/plugins/qmlprojectmanager/fileformat/qmlprojectitem.cpp index e82e90fedc..a659a5dd66 100644 --- a/src/plugins/qmlprojectmanager/fileformat/qmlprojectitem.cpp +++ b/src/plugins/qmlprojectmanager/fileformat/qmlprojectitem.cpp @@ -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; } diff --git a/src/plugins/qmlprojectmanager/fileformat/qmlprojectitem.h b/src/plugins/qmlprojectmanager/fileformat/qmlprojectitem.h index 4ba9afcd5f..a6982443d9 100644 --- a/src/plugins/qmlprojectmanager/fileformat/qmlprojectitem.h +++ b/src/plugins/qmlprojectmanager/fileformat/qmlprojectitem.h @@ -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 }; diff --git a/src/plugins/qmlprojectmanager/qmlproject.cpp b/src/plugins/qmlprojectmanager/qmlproject.cpp index 5b518ccc87..ecfe48378b 100644 --- a/src/plugins/qmlprojectmanager/qmlproject.cpp +++ b/src/plugins/qmlprojectmanager/qmlproject.cpp @@ -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(); diff --git a/src/plugins/qmlprojectmanager/qmlproject.h b/src/plugins/qmlprojectmanager/qmlproject.h index b3ce817f19..c75fa83614 100644 --- a/src/plugins/qmlprojectmanager/qmlproject.h +++ b/src/plugins/qmlprojectmanager/qmlproject.h @@ -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; |