From 4cafb66b3e02c8e80a648f792ec63f796454847b Mon Sep 17 00:00:00 2001 From: Yuchen Deng Date: Tue, 29 Apr 2014 08:08:28 +0800 Subject: [PATCH] No warning if qmlscene exist on Qt5+ We don't need warning if qmlviewer does not exist on Qt5+ because we can skip qtquick1 module right now. Change-Id: Idbe8488aad15e518b77c429de6b3bb5134e6ab32 Reviewed-by: Thomas Hartmann --- src/plugins/qtsupport/baseqtversion.cpp | 1 + src/plugins/qtsupport/desktopqtversion.cpp | 8 +++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/plugins/qtsupport/baseqtversion.cpp b/src/plugins/qtsupport/baseqtversion.cpp index 3ded2c6b24b..2e4e67b5597 100644 --- a/src/plugins/qtsupport/baseqtversion.cpp +++ b/src/plugins/qtsupport/baseqtversion.cpp @@ -721,6 +721,7 @@ QString BaseQtVersion::findQtBinary(Binaries binary) const else possibleCommands << QLatin1String("qmlscene"); } + break; case QmlViewer: { if (HostOsInfo::isWindowsHost()) possibleCommands << QLatin1String("qmlviewer.exe"); diff --git a/src/plugins/qtsupport/desktopqtversion.cpp b/src/plugins/qtsupport/desktopqtversion.cpp index df8be06b38e..17dd565b982 100644 --- a/src/plugins/qtsupport/desktopqtversion.cpp +++ b/src/plugins/qtsupport/desktopqtversion.cpp @@ -67,10 +67,12 @@ QString DesktopQtVersion::type() const QStringList DesktopQtVersion::warningReason() const { QStringList ret = BaseQtVersion::warningReason(); - if (qtVersion() >= QtVersionNumber(5, 0, 0) && qmlsceneCommand().isEmpty()) - ret << QCoreApplication::translate("QtVersion", "No qmlscene installed."); - if (qtVersion() >= QtVersionNumber(4, 7, 0) && qmlviewerCommand().isEmpty()) + if (qtVersion() >= QtVersionNumber(5, 0, 0)) { + if (qmlsceneCommand().isEmpty()) + ret << QCoreApplication::translate("QtVersion", "No qmlscene installed."); + } else if (qtVersion() >= QtVersionNumber(4, 7, 0) && qmlviewerCommand().isEmpty()) { ret << QCoreApplication::translate("QtVersion", "No qmlviewer installed."); + } return ret; }