From 30d1522b7a0ae99384457638ba875605705b786d Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 1 Jun 2012 11:08:52 +0200 Subject: 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 --- qmake/project.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'qmake/project.h') 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 &place); - void resolveSpec(QString *spec, const QString &qmakespec); QStringList qmakeFeaturePaths(); public: -- cgit v1.2.3