1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix specdir()

Browse Source 
get the actual spec path directly from the project - the specs in Option
are not necessarily resolved.

Change-Id: Ia2bf2199c5269aa5b5a9d4c38de36171f25d448b
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
This commit is contained in:
Oswald Buddenhagen 2012-06-26 15:36:39 +02:00
parent caa2263051
commit 4b637bf1f0
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
qmake/generators/makefile.cpp
View File

@ -3073,8 +3073,7 @@ QString
MakefileGenerator::specdir() MakefileGenerator::specdir()
{ {
if (spec.isEmpty()) if (spec.isEmpty())
spec = fileFixify(project->isHostBuild() spec = fileFixify(project->specDir());
? Option::mkfile::qmakespec : Option::mkfile::xqmakespec);
return spec; return spec;
} }

1
qmake/project.h
View File

@ -136,6 +136,7 @@ public:
QString projectFile(); QString projectFile();
QString confFile() const { return conffile; } QString confFile() const { return conffile; }
QString cacheFile() const { return cachefile; } QString cacheFile() const { return cachefile; }
QString specDir() const { return real_spec; }
inline QMakeProperty *properties() { return prop; } inline QMakeProperty *properties() { return prop; }
bool doProjectTest(QString str, QHash<QString, QStringList> &place); bool doProjectTest(QString str, QHash<QString, QStringList> &place);