From ced48beb6f554f8a8b9018ca1df1a4aa51940639 Mon Sep 17 00:00:00 2001
From: Christian Kandeler <christian.kandeler@nokia.com>
Date: Thu, 19 May 2011 17:38:30 +0200
Subject: [PATCH] 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: Christian Kandeler <christian.kandeler@nokia.com>
---
.../qt4projectmanager/qt-maemo/maemoconfigtestdialog.cpp | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemoconfigtestdialog.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemoconfigtestdialog.cpp
index 9aa324ccfbb..d652a69475b 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemoconfigtestdialog.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemoconfigtestdialog.cpp
@@ -265,10 +265,6 @@ QString MaemoConfigTestDialog::parseTestOutput()
output = tr("Hardware architecture: %1\n").arg(unamePattern.cap(2));
output.append(tr("Kernel version: %1\n").arg(unamePattern.cap(1)));
- if (m_config->osVersion() == MaemoDeviceConfig::GenericLinux) {
- m_qtVersionOk = true;
- return output;
- }
QString patternString;
switch (MaemoGlobal::packagingSystem(m_config->osVersion())) {
@@ -279,6 +275,7 @@ QString MaemoConfigTestDialog::parseTestOutput()
patternString = QLatin1String("(\\S+) (\\S*(\\d+)\\.(\\d+)\\.(\\d+)\\S*) \\S+ \\S+ \\S+");
break;
default:
+ m_qtVersionOk = true;
return output;
}
--
GitLab