OSDN Git Service

Fix bug when detecting S60 SDKs the first time.
authorcon <qtc-committer@nokia.com>
Fri, 9 Oct 2009 18:02:43 +0000 (20:02 +0200)
committercon <qtc-committer@nokia.com>
Fri, 9 Oct 2009 18:11:54 +0000 (20:11 +0200)
src/plugins/qt4projectmanager/qt-s60/s60manager.cpp

index bb1f602..6ef0c4d 100644 (file)
@@ -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);