Commit 192759cb authored by Oswald Buddenhagen's avatar Oswald Buddenhagen
Browse files

use a ProFileParser+ProFileEvaluator instead of a ProFileReader

the latter does too much
parent 2b68df12
......@@ -1329,11 +1329,17 @@ void QtVersion::updateToolChainAndMkspec() const
ProFileOption option;
option.properties = versionInfo();
ProMessageHandler msgHandler(true);
ProFileCacheManager::instance()->incRefCount();
ProFileReader *reader = new ProFileReader(&option);
reader->setCumulative(false);
reader->setParsePreAndPostFiles(false);
reader->readProFile(m_mkspecFullPath + "/qmake.conf");
ProFileParser parser(ProFileCacheManager::instance()->cache(), &msgHandler);
ProFileEvaluator *reader = new ProFileEvaluator(&option, &parser, &msgHandler);
if (ProFile *pro = parser.parsedProFile(m_mkspecFullPath + "/qmake.conf")) {
reader->setCumulative(false);
reader->setParsePreAndPostFiles(false);
reader->accept(pro);
pro->deref();
}
QString qmakeCXX = reader->values("QMAKE_CXX").join(" ");
QString makefileGenerator = reader->value("MAKEFILE_GENERATOR");
QString ce_sdk = reader->values("CE_SDK").join(QLatin1String(" "));
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment