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

Qt Versions: Differentiate between qmlscene and qmlviewer

Browse Source 
Qt5 features both qmlviewer (QtQuick1) and qmlscene. We can't just
assume that everybody wants to use qmlscene.

Change-Id: I6668b7776869826575ce035f1e9ace47908013ff
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
This commit is contained in:
Kai Koehne
2012-08-21 16:26:23 +02:00
parent 6a56990302
commit 4dd31391a2
4 changed files with 28 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qt4projectmanager/qt-desktop/simulatorqtversion.cpp
View File

@@ -71,6 +71,8 @@ QString SimulatorQtVersion::type() const
QStringList SimulatorQtVersion::warningReason() const
{
QStringList ret = BaseQtVersion::warningReason();
if (qtVersion() >= QtSupport::QtVersionNumber(5, 0, 0) && qmlsceneCommand().isEmpty())
ret << QCoreApplication::translate("QtVersion", "No qmlscene installed.");
if (qtVersion() >= QtSupport::QtVersionNumber(4, 7, 0) && qmlviewerCommand().isEmpty())
ret << QCoreApplication::translate("QtVersion", "No qmlviewer installed.");
return ret;