diff options
author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-05-10 10:41:54 +0200 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-06-19 16:46:02 +0200 |
commit | f86f3613a52568e216c98d8f19ecc5204e76c3fb (patch) | |
tree | 6ad26374d6982beedb8dd4a2fb966ad61738972a /qmake/project.h | |
parent | c80697cfbe9071152e49559e9f375352cd205029 (diff) |
find .qmake.cache for subprojects independently
this allows the creation of aggregator projects, like, say, qt5.
this is not expected to have a negative impact, as no project could
reasonably expect a nested .qmake.cache to *not* take effect - in fact,
if the project was processed stand-alone, it would already use it.
Change-Id: I33f2935d309baba7e95465f2fefb8231c4f03eda
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.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 700509b2a6..aa31ec9897 100644 --- a/qmake/project.h +++ b/qmake/project.h @@ -83,6 +83,7 @@ class QMakeProject bool need_restart; bool own_prop; bool backslashWarned; + QString cachefile; QString pfile; QMakeProperty *prop; void reset(); @@ -131,6 +132,7 @@ public: QStringList userTestFunctions() { return testFunctions.keys(); } QString projectFile(); + QString cacheFile() const { return cachefile; } inline QMakeProperty *properties() { return prop; } bool doProjectTest(QString str, QHash<QString, QStringList> &place); |