tools/shared/symbian/epocroot.cpp
changeset 30 5dc02b23752f
parent 18 2f34d5167611
child 33 3e2da88830cd
--- a/tools/shared/symbian/epocroot.cpp	Wed Jun 23 19:07:03 2010 +0300
+++ b/tools/shared/symbian/epocroot.cpp	Tue Jul 06 15:10:48 2010 +0300
@@ -153,10 +153,13 @@
                                 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) {