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

Find Qt installation by specification of qmake rather than a "Qt dir".

Browse Source 
Rationale: The concept of a "Qt Dir" is dead ever since Qt can be
installed. Specifying the qmake location otoh makes it possible to
unambigously detect all parts of a Qt installation.
This commit is contained in:
Daniel Molkentin
2009-09-03 19:16:22 +02:00
parent 267ef8ecc5
commit 5476bcf560
13 changed files with 178 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -124,7 +124,7 @@ void S60Manager::updateQtVersions()
}
if (deviceVersion) {
deviceVersion->setName(QString("%1 (Qt %2)").arg(device.id, deviceVersion->qtVersionString()));
deviceVersion->setPath(device.qt);
deviceVersion->setQMakeCommand(device.qt+"/bin/qmake.exe");
handledVersions.append(deviceVersion);
} else {
deviceVersion = new QtVersion(QString("%1 (Qt %2)").arg(device.id), device.qt,
@@ -171,8 +171,9 @@ S60Devices::Device S60Manager::deviceForQtVersion(const Qt4ProjectManager::QtVer
deviceId = deviceIdFromDetectionSource(version->autodetectionSource());
if (deviceId.isEmpty()) { // it's not an s60 autodetected version
// have a look if we find the device root anyhow
if (QFile::exists(QString::fromLatin1("%1/epoc32").arg(version->path()))) {
device.epocRoot = version->path();
QString qtPath = version->versionInfo().value("QT_INSTALL_DATA");
if (QFile::exists(QString::fromLatin1("%1/epoc32").arg(qtPath))) {
device.epocRoot = qtPath;
device.toolsRoot = device.epocRoot;
device.qt = device.epocRoot;
device.isDefault = false;