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

Maemo: Don't assume a remote Linux has package management ...

Browse Source 
... in the config test dialog.
This commit is contained in:
Christian Kandeler
2011-05-13 18:06:50 +02:00
parent 9ccca96b20
commit 86fc5fee08
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/plugins/qt4projectmanager/qt-maemo/maemoconfigtestdialog.cpp
View File

@@ -270,10 +270,19 @@ QString MaemoConfigTestDialog::parseTestOutput()
return output; return output;
} }
const bool osUsesRpm = MaemoGlobal::packagingSystem(m_config->osVersion()) == MaemoGlobal::Rpm; QString patternString;
const QRegExp packagePattern(QLatin1String(osUsesRpm switch (MaemoGlobal::packagingSystem(m_config->osVersion())) {
? "(libqt\\S+) ((\\d+)\\.(\\d+)\\.(\\d+))" case MaemoGlobal::Rpm:
: "(\\S+) (\\S*(\\d+)\\.(\\d+)\\.(\\d+)\\S*) \\S+ \\S+ \\S+")); patternString = QLatin1String("(libqt\\S+) ((\\d+)\\.(\\d+)\\.(\\d+))");
break;
case MaemoGlobal::Dpkg:
patternString = QLatin1String("(\\S+) (\\S*(\\d+)\\.(\\d+)\\.(\\d+)\\S*) \\S+ \\S+ \\S+");
break;
default:
return output;
}
const QRegExp packagePattern(patternString);
index = packagePattern.indexIn(m_deviceTestOutput); index = packagePattern.indexIn(m_deviceTestOutput);
if (index == -1) { if (index == -1) {
output.append(tr("No Qt packages installed.")); output.append(tr("No Qt packages installed."));