diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-07-06 19:22:41 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-07-09 21:17:06 +0200 |
| commit | de59f3a33bda6d9c629e5c9ff2a4297f58d45765 (patch) | |
| tree | ae964ea33ac57739181676c63d9bf62075077624 /src/plugins/qt4projectmanager/qt-desktop/desktopqtversion.cpp | |
| parent | c902fdf30ff2e402876315a8fe4155a0476cedb1 (diff) | |
make *QtVersion::warningReason() return a string list
unlike errors, warnings can accumulate
Change-Id: I6632d37a39bf3467d907cfe5c44ba555b918020a
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Diffstat (limited to 'src/plugins/qt4projectmanager/qt-desktop/desktopqtversion.cpp')
| -rw-r--r-- | src/plugins/qt4projectmanager/qt-desktop/desktopqtversion.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/plugins/qt4projectmanager/qt-desktop/desktopqtversion.cpp b/src/plugins/qt4projectmanager/qt-desktop/desktopqtversion.cpp index 1c78eeacdd..ba36c19a4e 100644 --- a/src/plugins/qt4projectmanager/qt-desktop/desktopqtversion.cpp +++ b/src/plugins/qt4projectmanager/qt-desktop/desktopqtversion.cpp @@ -70,13 +70,14 @@ QString DesktopQtVersion::type() const return QLatin1String(QtSupport::Constants::DESKTOPQT); } -QString DesktopQtVersion::warningReason() const +QStringList DesktopQtVersion::warningReason() const { + QStringList ret; if (qtAbis().count() == 1 && qtAbis().first().isNull()) - return QCoreApplication::translate("QtVersion", "ABI detection failed: Make sure to use a matching tool chain when building."); + ret << QCoreApplication::translate("QtVersion", "ABI detection failed: Make sure to use a matching tool chain when building."); if (qtVersion() >= QtSupport::QtVersionNumber(4, 7, 0) && qmlviewerCommand().isEmpty()) - return QCoreApplication::translate("QtVersion", "No qmlviewer installed."); - return QString(); + ret << QCoreApplication::translate("QtVersion", "No qmlviewer installed."); + return ret; } QList<ProjectExplorer::Abi> DesktopQtVersion::detectQtAbis() const |