diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2010-05-14 08:39:39 (GMT) |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2010-05-14 08:50:27 (GMT) |
| commit | cd719dee504dc70d53a6b24e746caf9e69d83ddb (patch) | |
| tree | 2a628fc13287f78010a09089e3cca89e1e0d5445 | |
| parent | 61d21436d5627dc42506bdb257e107d6a4ffd498 (diff) | |
| download | Qt-cd719dee504dc70d53a6b24e746caf9e69d83ddb.zip Qt-cd719dee504dc70d53a6b24e746caf9e69d83ddb.tar.gz Qt-cd719dee504dc70d53a6b24e746caf9e69d83ddb.tar.bz2 | |
Support device aliases in EPOCDEVICE
Qmake now understands use of device aliases in EPOCDEVICE environment
variable.
Task-number: QTBUG-9108
Reviewed-by: Janne Anttila
| -rw-r--r-- | tools/shared/symbian/epocroot.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/tools/shared/symbian/epocroot.cpp b/tools/shared/symbian/epocroot.cpp index 071477d..064e056 100644 --- a/tools/shared/symbian/epocroot.cpp +++ b/tools/shared/symbian/epocroot.cpp @@ -153,10 +153,13 @@ QString epocRoot() while (!(xml.isEndElement() && xml.name() == "devices") && !xml.atEnd()) { xml.readNext(); if (xml.isStartElement() && xml.name() == "device") { - const bool isDefault = xml.attributes().value("default") == "yes"; + const bool isDefault = xml.attributes().value("default") == "yes"; const QString id = xml.attributes().value("id").toString(); - const QString name = xml.attributes().value("name").toString(); - const bool epocDeviceMatch = (id + ":" + name) == epocDeviceValue; + const QString name = xml.attributes().value("name").toString(); + const QString alias = xml.attributes().value("alias").toString(); + bool epocDeviceMatch = (id + ":" + name) == epocDeviceValue; + if (!alias.isEmpty()) + epocDeviceMatch |= alias == epocDeviceValue; epocDeviceFound |= epocDeviceMatch; if((epocDeviceValue.isEmpty() && isDefault) || epocDeviceMatch) { |