diff --git a/src/plugins/qt4projectmanager/profilereader.cpp b/src/plugins/qt4projectmanager/profilereader.cpp index a2ea7ff2dfab4eee4611a54234b6f54dc92eb034..21930b8dc72f859ae769354978dc170724e64f40 100644 --- a/src/plugins/qt4projectmanager/profilereader.cpp +++ b/src/plugins/qt4projectmanager/profilereader.cpp @@ -89,16 +89,6 @@ ProFileReader::~ProFileReader() pf->deref(); } -bool ProFileReader::readProFile(const QString &fileName) -{ - if (ProFile *pro = parsedProFile(fileName)) { - bool ok = accept(pro); - pro->deref(); - return ok; - } - return false; -} - void ProFileReader::aboutToEval(ProFile *, ProFile *pro, EvalFileType type) { if (m_ignoreLevel || (type != EvalProjectFile && type != EvalIncludeFile)) { diff --git a/src/plugins/qt4projectmanager/profilereader.h b/src/plugins/qt4projectmanager/profilereader.h index c133652586f053840f4afeaa1973d876481dc8aa..007fcb3004357a0017a805671393730a3ba884d9 100644 --- a/src/plugins/qt4projectmanager/profilereader.h +++ b/src/plugins/qt4projectmanager/profilereader.h @@ -71,8 +71,6 @@ public: ProFileReader(ProFileOption *option); ~ProFileReader(); - // fileName is expected to be absolute and cleanPath()ed. - bool readProFile(const QString &fileName); QList<ProFile*> includeFiles() const; ProFile *proFileFor(const QString &name); diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemopackagecontents.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemopackagecontents.cpp index 65142a6a991fc8aa074ec3c5a3b674f4214fe73d..2efa3ce70570a7901ead411ed712c1d14fb28767 100644 --- a/src/plugins/qt4projectmanager/qt-maemo/maemopackagecontents.cpp +++ b/src/plugins/qt4projectmanager/qt-maemo/maemopackagecontents.cpp @@ -421,8 +421,12 @@ void MaemoPackageContents::parseProFile(ParseType type) const m_proFile = m_proFileReader->parsedProFile(m_proFileName, false, m_proFileLines.join("\n")); } else { - m_proFile = m_proFileReader->readProFile(m_proFileName) - ? m_proFileReader->proFileFor(m_proFileName) : 0; + m_proFile = 0; + if (ProFile *pro = m_proFileReader->parsedProFile(m_proFileName)) { + if (m_proFileReader->accept(pro)) + m_proFile = pro; + pro->deref(); + } } }