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

QMLProject: Pick the correct QMLViewer depending on Qt Version

Browse Source 
Change-Id: Ice9fa1294f29e1376afbf7af1a112e7d99a44b10
Reviewed-on: http://codereview.qt-project.org/4998
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
This commit is contained in:
Aurindam Jana
2011-09-15 14:45:17 +02:00
parent 18f6c5e457
commit 9d730da17a
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -551,14 +551,17 @@ QString BaseQtVersion::findQtBinary(BINARIES binary) const
QStringList possibleCommands;
switch (binary) {
case QmlViewer:
#if defined(Q_OS_MAC)
possibleCommands << QLatin1String("QMLViewer");
#elif defined(Q_OS_WIN)
possibleCommands << QLatin1String("qmlviewer.exe");
case QmlViewer: {
if (qtVersion() < QtVersionNumber(5, 0, 0)) {
possibleCommands << possibleGuiBinaries(QLatin1String("qmlviewer"));
} else {
#if defined(Q_OS_WIN)
possibleCommands << QLatin1String("qmlscene.exe");
#else
possibleCommands << QLatin1String("qmlviewer");
possibleCommands << QLatin1String("qmlscene");
#endif
}
}
break;
case Designer:
possibleCommands << possibleGuiBinaries(QLatin1String("designer"));