fix loading of qmakespecs in the qt support classes

it's not sufficient to load the qmake.conf only any more.

Change-Id: Ic699ad5e202d6f3e115e44621b4c6ee2def6edd2
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
This commit is contained in:
Oswald Buddenhagen
2012-08-29 14:58:12 +02:00
parent 3e0950bd86
commit 465f2a1562
6 changed files with 42 additions and 29 deletions

View File

@@ -184,6 +184,15 @@ ProFileEvaluator::TemplateType ProFileEvaluator::templateType() const
return TT_Unknown;
}
bool ProFileEvaluator::loadNamedSpec(const QString &specDir, bool hostSpec)
{
d->m_qmakespec = specDir;
d->m_hostBuild = hostSpec;
d->updateMkspecPaths();
return d->loadSpecInternal();
}
bool ProFileEvaluator::accept(ProFile *pro, QMakeEvaluator::LoadFlags flags)
{
return d->visitProFile(pro, QMakeHandler::EvalProjectFile, flags) == QMakeEvaluator::ReturnTrue;