From 8a0739813e11a052b1dae9bef078357b1156a48e Mon Sep 17 00:00:00 2001
From: con <qtc-committer@nokia.com>
Date: Fri, 9 Oct 2009 20:02:43 +0200
Subject: [PATCH] Fix bug when detecting S60 SDKs the first time.
---
src/plugins/qt4projectmanager/qt-s60/s60manager.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60manager.cpp b/src/plugins/qt4projectmanager/qt-s60/s60manager.cpp
index bb1f6027574..6ef0c4dde5b 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60manager.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/s60manager.cpp
@@ -168,11 +168,11 @@ void S60Manager::updateQtVersions()
}
}
if (deviceVersion) {
- deviceVersion->setName(QString("%1 (Qt %2)").arg(device.id, deviceVersion->qtVersionString()));
deviceVersion->setQMakeCommand(device.qt+"/bin/qmake.exe");
+ deviceVersion->setName(QString("%1 (Qt %2)").arg(device.id, deviceVersion->qtVersionString()));
handledVersions.append(deviceVersion);
} else {
- deviceVersion = new QtVersion(QString("%1 (Qt %2)").arg(device.id), device.qt,
+ deviceVersion = new QtVersion(QString("%1 (Qt %2)").arg(device.id), device.qt+"/bin/qmake.exe",
true, QString("%1.%2").arg(S60_AUTODETECTION_SOURCE, device.id));
deviceVersion->setName(deviceVersion->name().arg(deviceVersion->qtVersionString()));
versionsToAdd.append(deviceVersion);
--
GitLab