diff options
| author | Daniel Teske <daniel.teske@nokia.com> | 2012-09-04 11:41:32 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-05-28 12:50:39 +0200 |
| commit | b48c0d1307597eb8576cae2cb3fec969af9a1f80 (patch) | |
| tree | 1da23bd91be960f74224f54e37f056eca0b7405d | |
| parent | b8cd09210681be4cec6b2896cfa7f26b917f0ed0 (diff) | |
| download | qttools-b48c0d1307597eb8576cae2cb3fec969af9a1f80.tar.gz | |
add ProFileEvaluator::resolvedMkSpec()
sync up implementation with qtcreator.
Change-Id: I9408541a09a6a687fdbae879bd1ab4c92e62aa1e
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
(cherry picked from qtcreator/867d655278398561c2bfe879e42062f93ae85453)
(cherry picked from qtcreator/7d4e3b7b4c69c9bcc42aa278ce91f4188fc06534)
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| -rw-r--r-- | src/linguist/shared/profileevaluator.cpp | 5 | ||||
| -rw-r--r-- | src/linguist/shared/profileevaluator.h | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/src/linguist/shared/profileevaluator.cpp b/src/linguist/shared/profileevaluator.cpp index 3d135cde8..f22b3f48b 100644 --- a/src/linguist/shared/profileevaluator.cpp +++ b/src/linguist/shared/profileevaluator.cpp @@ -215,6 +215,11 @@ QString ProFileEvaluator::propertyValue(const QString &name) const return d->m_option->propertyValue(ProKey(name)).toQString(); } +QString ProFileEvaluator::resolvedMkSpec() const +{ + return d->m_qmakespec; +} + #ifdef PROEVALUATOR_CUMULATIVE void ProFileEvaluator::setCumulative(bool on) { diff --git a/src/linguist/shared/profileevaluator.h b/src/linguist/shared/profileevaluator.h index 50ec282d4..6046b1bae 100644 --- a/src/linguist/shared/profileevaluator.h +++ b/src/linguist/shared/profileevaluator.h @@ -102,6 +102,8 @@ public: const ProFile *pro) const; QString propertyValue(const QString &val) const; + QString resolvedMkSpec() const; + private: QString sysrootify(const QString &path, const QString &baseDir) const; |