From 9d730da17a3183add69969755ec8d301f7b1216c Mon Sep 17 00:00:00 2001
From: Aurindam Jana <aurindam.jana@nokia.com>
Date: Thu, 15 Sep 2011 14:45:17 +0200
Subject: [PATCH] QMLProject: Pick the correct QMLViewer depending on Qt
 Version

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>
---
 src/plugins/qtsupport/baseqtversion.cpp | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/plugins/qtsupport/baseqtversion.cpp b/src/plugins/qtsupport/baseqtversion.cpp
index 1cfab3b1998..181e3f42c15 100644
--- a/src/plugins/qtsupport/baseqtversion.cpp
+++ b/src/plugins/qtsupport/baseqtversion.cpp
@@ -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"));