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

Maemo: Get rid of some Q_ASSERTs that limit forward compatibility.

Browse Source
This commit is contained in:
Christian Kandeler
2011-04-12 08:15:18 +02:00
parent 37fa34e269
commit 048756a66d
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurations.cpp
View File

@@ -339,7 +339,7 @@ QString MaemoDeviceConfig::defaultUser(MaemoGlobal::MaemoVersion osVersion)
case MaemoGlobal::Meego: case MaemoGlobal::Meego:
return QLatin1String("meego"); return QLatin1String("meego");
default: default:
Q_ASSERT(false); qDebug("%s: Unknown OS Version %d.", Q_FUNC_INFO, osVersion);
return QString(); return QString();
} }
} }
@@ -353,7 +353,7 @@ QString MaemoDeviceConfig::defaultQemuPassword(MaemoGlobal::MaemoVersion osVersi
case MaemoGlobal::Meego: case MaemoGlobal::Meego:
return QLatin1String("meego"); return QLatin1String("meego");
default: default:
Q_ASSERT(false); qDebug("%s: Unknown OS Version %d.", Q_FUNC_INFO, osVersion);
return QString(); return QString();
} }
} }

2
src/plugins/qt4projectmanager/qt-maemo/maemoglobal.cpp
View File

@@ -342,7 +342,7 @@ QString MaemoGlobal::maemoVersionToString(MaemoVersion version)
case Maemo6: return QLatin1String("Harmattan"); case Maemo6: return QLatin1String("Harmattan");
case Meego: return QLatin1String("Meego"); case Meego: return QLatin1String("Meego");
} }
Q_ASSERT(false); qDebug("%s: Unknown OS Version %d.", Q_FUNC_INFO, osVersion);
return QString(); return QString();
} }