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

Fix bug when detecting S60 SDKs the first time.

Browse Source 
(cherry picked from commit 8a0739813e)
This commit is contained in:
con
2009-10-09 20:02:43 +02:00
parent 969032f06f
commit 2560830f70
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/qt4projectmanager/qt-s60/s60manager.cpp
View File

@@ -168,11 +168,11 @@ void S60Manager::updateQtVersions()
} }
} }
if (deviceVersion) { if (deviceVersion) {
deviceVersion->setName(QString("%1 (Qt %2)").arg(device.id, deviceVersion->qtVersionString()));
deviceVersion->setQMakeCommand(device.qt+"/bin/qmake.exe"); deviceVersion->setQMakeCommand(device.qt+"/bin/qmake.exe");
deviceVersion->setName(QString("%1 (Qt %2)").arg(device.id, deviceVersion->qtVersionString()));
handledVersions.append(deviceVersion); handledVersions.append(deviceVersion);
} else { } 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)); true, QString("%1.%2").arg(S60_AUTODETECTION_SOURCE, device.id));
deviceVersion->setName(deviceVersion->name().arg(deviceVersion->qtVersionString())); deviceVersion->setName(deviceVersion->name().arg(deviceVersion->qtVersionString()));
versionsToAdd.append(deviceVersion); versionsToAdd.append(deviceVersion);