feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Maemo: get rid of dependency on madde.conf.

Browse Source 
Parse script output instead.

Done-with: kh1
This commit is contained in:
Christian Kandeler
2010-09-07 17:43:27 +02:00
parent a9a99225b8
commit bc2d2897fc
2 changed files with 69 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/plugins/qt4projectmanager/qt-maemo/maemomanager.cpp
View File

@@ -98,22 +98,30 @@ MaemoManager &MaemoManager::instance()
bool MaemoManager::isValidMaemoQtVersion(const QtVersion *version) const
{
QString path = QDir::cleanPath(version->qmakeCommand());
path = path.remove(QLatin1String("/bin/qmake" EXEC_SUFFIX));
path.remove(QLatin1String("/bin/qmake" EXEC_SUFFIX));
QDir dir(path);
const QByteArray target = dir.dirName().toAscii();
dir.cdUp(); dir.cdUp();
QString madAdminCommand(dir.absolutePath() + QLatin1String("/bin/mad-admin"));
if (!QFileInfo(madAdminCommand).exists())
return false;
QFile file(dir.absolutePath() + QLatin1String("/cache/madde.conf"));
if (file.exists() && file.open(QIODevice::ReadOnly | QIODevice::Text)) {
const QString &target = path.mid(path.lastIndexOf(QLatin1Char('/')) + 1);
QTextStream stream(&file);
while (!stream.atEnd()) {
const QString &line = stream.readLine().trimmed();
if (line.startsWith(QLatin1String("target"))
&& line.endsWith(target)) {
return true;
}
}
QStringList arguments(QLatin1String("list"));
#ifdef Q_OS_WIN
arguments.prepend(madAdminCommand);
madAdminCommand = dir.absolutePath() + QLatin1String("/bin/sh.exe");
#endif
QProcess madAdminProc;
madAdminProc.start(madAdminCommand, arguments);
if (!madAdminProc.waitForStarted() || !madAdminProc.waitForFinished())
return false;
madAdminProc.setReadChannel(QProcess::StandardOutput);
while (madAdminProc.canReadLine()) {
const QByteArray &line = madAdminProc.readLine();
if (line.contains(target) && line.contains("(installed)"))
return true;
}
return false;
}