diff options
author | con <qtc-committer@nokia.com> | 2009-10-09 20:02:43 +0200 |
---|---|---|
committer | con <qtc-committer@nokia.com> | 2009-10-09 20:13:19 +0200 |
commit | 2560830f7090ea74de8d8a20d1bb37777d2d370d (patch) | |
tree | 2f30a6d11ee7dfb833482113decedb9aa272c205 | |
parent | 969032f06fa4025b119dfe64e6fe780c747ef610 (diff) |
Fix bug when detecting S60 SDKs the first time.
(cherry picked from commit 8a0739813e11a052b1dae9bef078357b1156a48e)
-rw-r--r-- | src/plugins/qt4projectmanager/qt-s60/s60manager.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60manager.cpp b/src/plugins/qt4projectmanager/qt-s60/s60manager.cpp index bb1f602757..6ef0c4dde5 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); |