Skip to content
Snippets Groups Projects
Commit ced48beb authored by Christian Kandeler's avatar Christian Kandeler
Browse files

Maemo: Fix device configuration dialog for all OS types.

There could potentially be types other than GenericLinux that
don't use dpkg or rpm.

Change-Id: I62a03aa1f532a4f589be8e43e07410beb1370cb2
Reviewed-on: http://codereview.qt.nokia.com/26


Reviewed-by: default avatarChristian Kandeler <christian.kandeler@nokia.com>
parent d4e5b81e
No related branches found
No related tags found
No related merge requests found
...@@ -265,10 +265,6 @@ QString MaemoConfigTestDialog::parseTestOutput() ...@@ -265,10 +265,6 @@ QString MaemoConfigTestDialog::parseTestOutput()
output = tr("Hardware architecture: %1\n").arg(unamePattern.cap(2)); output = tr("Hardware architecture: %1\n").arg(unamePattern.cap(2));
output.append(tr("Kernel version: %1\n").arg(unamePattern.cap(1))); output.append(tr("Kernel version: %1\n").arg(unamePattern.cap(1)));
if (m_config->osVersion() == MaemoDeviceConfig::GenericLinux) {
m_qtVersionOk = true;
return output;
}
QString patternString; QString patternString;
switch (MaemoGlobal::packagingSystem(m_config->osVersion())) { switch (MaemoGlobal::packagingSystem(m_config->osVersion())) {
...@@ -279,6 +275,7 @@ QString MaemoConfigTestDialog::parseTestOutput() ...@@ -279,6 +275,7 @@ QString MaemoConfigTestDialog::parseTestOutput()
patternString = QLatin1String("(\\S+) (\\S*(\\d+)\\.(\\d+)\\.(\\d+)\\S*) \\S+ \\S+ \\S+"); patternString = QLatin1String("(\\S+) (\\S*(\\d+)\\.(\\d+)\\.(\\d+)\\S*) \\S+ \\S+ \\S+");
break; break;
default: default:
m_qtVersionOk = true;
return output; return output;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment