From 048756a66d492df0924afa72796caa8d292b4627 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Tue, 12 Apr 2011 08:15:18 +0200 Subject: [PATCH] Maemo: Get rid of some Q_ASSERTs that limit forward compatibility. --- .../qt4projectmanager/qt-maemo/maemodeviceconfigurations.cpp | 4 ++-- src/plugins/qt4projectmanager/qt-maemo/maemoglobal.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurations.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurations.cpp index eef1ac55f96..a2f429658d8 100644 --- a/src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurations.cpp +++ b/src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurations.cpp @@ -339,7 +339,7 @@ QString MaemoDeviceConfig::defaultUser(MaemoGlobal::MaemoVersion osVersion) case MaemoGlobal::Meego: return QLatin1String("meego"); default: - Q_ASSERT(false); + qDebug("%s: Unknown OS Version %d.", Q_FUNC_INFO, osVersion); return QString(); } } @@ -353,7 +353,7 @@ QString MaemoDeviceConfig::defaultQemuPassword(MaemoGlobal::MaemoVersion osVersi case MaemoGlobal::Meego: return QLatin1String("meego"); default: - Q_ASSERT(false); + qDebug("%s: Unknown OS Version %d.", Q_FUNC_INFO, osVersion); return QString(); } } diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemoglobal.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemoglobal.cpp index 3b1c64a9e8a..a9b81454f73 100644 --- a/src/plugins/qt4projectmanager/qt-maemo/maemoglobal.cpp +++ b/src/plugins/qt4projectmanager/qt-maemo/maemoglobal.cpp @@ -342,7 +342,7 @@ QString MaemoGlobal::maemoVersionToString(MaemoVersion version) case Maemo6: return QLatin1String("Harmattan"); case Meego: return QLatin1String("Meego"); } - Q_ASSERT(false); + qDebug("%s: Unknown OS Version %d.", Q_FUNC_INFO, osVersion); return QString(); }