forked from qt-creator/qt-creator
		
	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>
This commit is contained in:
		@@ -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;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user