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

No warning if qmlscene exist on Qt5+

Browse Source 
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 <Thomas.Hartmann@digia.com>
This commit is contained in:
Yuchen Deng
2014-04-29 08:08:28 +08:00
parent e95790c696
commit 4cafb66b3e
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/qtsupport/baseqtversion.cpp
View File

@@ -721,6 +721,7 @@ QString BaseQtVersion::findQtBinary(Binaries binary) const
else else
possibleCommands << QLatin1String("qmlscene"); possibleCommands << QLatin1String("qmlscene");
} }
break;
case QmlViewer: { case QmlViewer: {
if (HostOsInfo::isWindowsHost()) if (HostOsInfo::isWindowsHost())
possibleCommands << QLatin1String("qmlviewer.exe"); possibleCommands << QLatin1String("qmlviewer.exe");

6
src/plugins/qtsupport/desktopqtversion.cpp
View File

@@ -67,10 +67,12 @@ QString DesktopQtVersion::type() const
QStringList DesktopQtVersion::warningReason() const QStringList DesktopQtVersion::warningReason() const
{ {
QStringList ret = BaseQtVersion::warningReason(); QStringList ret = BaseQtVersion::warningReason();
if (qtVersion() >= QtVersionNumber(5, 0, 0) && qmlsceneCommand().isEmpty()) if (qtVersion() >= QtVersionNumber(5, 0, 0)) {
if (qmlsceneCommand().isEmpty())
ret << QCoreApplication::translate("QtVersion", "No qmlscene installed."); ret << QCoreApplication::translate("QtVersion", "No qmlscene installed.");
if (qtVersion() >= QtVersionNumber(4, 7, 0) && qmlviewerCommand().isEmpty()) } else if (qtVersion() >= QtVersionNumber(4, 7, 0) && qmlviewerCommand().isEmpty()) {
ret << QCoreApplication::translate("QtVersion", "No qmlviewer installed."); ret << QCoreApplication::translate("QtVersion", "No qmlviewer installed.");
}
return ret; return ret;
} }