diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-06-01 11:08:52 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-06-27 09:39:50 +0200 |
| commit | 30d1522b7a0ae99384457638ba875605705b786d (patch) | |
| tree | a304646814a7d638c3fcbab7343b1f20c2e6dd45 /qmake/project.h | |
| parent | 32bc46a90b7aa2506ea2e98c84ee518d80a53769 (diff) | |
resolve real qmakespec name right after loading it
this is cleaner than resolving it on-demand, as it avoids statics (with
potential side effects on dynamic spec switching).
Change-Id: I2bc15a4c3108376e1b4a01351875fe0c445ee5d5
Reviewed-by: Mark Brand <mabrand@mabrand.nl>
Diffstat (limited to 'qmake/project.h')
| -rw-r--r-- | qmake/project.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qmake/project.h b/qmake/project.h index 4ee6a02597..0e1ab7d870 100644 --- a/qmake/project.h +++ b/qmake/project.h @@ -86,6 +86,7 @@ class QMakeProject QString conffile; QString superfile; QString cachefile; + QString real_spec, short_spec; QString pfile; QMakeProperty *prop; void reset(); @@ -114,7 +115,6 @@ class QMakeProject void init(QMakeProperty *); void cleanup(); QStringList &values(const QString &v, QHash<QString, QStringList> &place); - void resolveSpec(QString *spec, const QString &qmakespec); QStringList qmakeFeaturePaths(); public: |