diff options
author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-04-13 21:18:36 +0200 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-04-21 12:06:20 +0000 |
commit | 4c96367410500c1b373a78cc3b5c6e07e8c998a5 (patch) | |
tree | dd85decb58aa3c69f606e040c3d7a3bb5d0ab025 /qmake/project.h | |
parent | 6234dec41f48383ea3fe848fa2b3f1de64e426ba (diff) |
make fileFixify() calling convention somewhat sane
instead of allowing arbitrary input and output base paths, restrict them
to the project input and output dirs (in any permutation), which are the
only cases ever used anyway.
this permits much clearer call sites, and allows later optimizations.
Change-Id: I48d149a4417af5c858e66ec57c476a5bc6b17f17
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Diffstat (limited to 'qmake/project.h')
-rw-r--r-- | qmake/project.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/qmake/project.h b/qmake/project.h index 9a5d0e285e..7cd49a457c 100644 --- a/qmake/project.h +++ b/qmake/project.h @@ -41,6 +41,7 @@ QT_BEGIN_NAMESPACE class QMakeProject : private QMakeEvaluator { QString m_projectFile; + QString m_projectDir; public: QMakeProject(); @@ -49,6 +50,7 @@ public: bool read(const QString &project, LoadFlags what = LoadAll); QString projectFile() const { return m_projectFile; } + QString projectDir() const { return m_projectDir; } QString sourceRoot() const { return m_sourceRoot.isEmpty() ? m_buildRoot : m_sourceRoot; } QString buildRoot() const { return m_buildRoot; } QString confFile() const { return m_conffile; } |