Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-public

2 files changed, 18 insertions, 48 deletions

diff --git a/qmake/generators/win32/msvc_objectmodel.cpp b/qmake/generators/win32/msvc_objectmodel.cpp
index 9d3fa67..372d902 100644
--- a/qmake/generators/win32/msvc_objectmodel.cpp
+++ b/qmake/generators/win32/msvc_objectmodel.cpp
@@ -49,9 +49,9 @@ QT_BEGIN_NAMESPACE
 // XML Tags ---------------------------------------------------------
 const char _Configuration[]                     = "Configuration";
 const char _Configurations[]                    = "Configurations";
-const char _File[]                              = "File";
+const char q_File[]                              = "File";
 const char _FileConfiguration[]                 = "FileConfiguration";
-const char _Files[]                             = "Files";
+const char q_Files[]                             = "Files";
 const char _Filter[]                            = "Filter";
 const char _Globals[]                           = "Globals";
 const char _Platform[]                          = "Platform";
@@ -2402,11 +2402,11 @@ XmlOutput &operator<<(XmlOutput &xml, VCFilter &tool)
     }
     for (int i = 0; i < tool.Files.count(); ++i) {
         const VCFilterFile &info = tool.Files.at(i);
-        xml << tag(_File)
+        xml << tag(q_File)
                 << attrS(_RelativePath, Option::fixPathToLocalOS(info.file))
             << data(); // In case no custom builds, to avoid "/>" endings
         tool.outputFileConfig(xml, tool.Files.at(i).file);
-        xml << closetag(_File);
+        xml << closetag(q_File);
     }
     if (!tool.Name.isEmpty())
         xml << closetag(_Filter);
@@ -2442,7 +2442,7 @@ XmlOutput &operator<<(XmlOutput &xml, const VCProjectSingleConfig &tool)
             << tag(_Configurations)
             << tool.Configuration;
     xml     << closetag(_Configurations)
-            << tag(_Files);
+            << tag(q_Files);
     // Add this configuration into a multi-config project, since that's where we have the flat/tree
     // XML output functionality
     VCProject tempProj;
@@ -2458,7 +2458,7 @@ XmlOutput &operator<<(XmlOutput &xml, const VCProjectSingleConfig &tool)
         tempProj.outputFilter(xml, tempProj.ExtraCompilers.at(x));
     }
     tempProj.outputFilter(xml, "RootFiles");
-    xml     << closetag(_Files)
+    xml     << closetag(q_Files)
             << tag(_Globals)
                 << data(); // No "/>" end tag
     return xml;
@@ -2513,7 +2513,7 @@ void VCProject::outputFileConfigs(XmlOutput &xml,
                                   const VCFilterFile &info,
                                   const QString &filtername)
 {
-    xml << tag(_File)
+    xml << tag(q_File)
             << attrS(_RelativePath, Option::fixPathToLocalOS(info.file));
     for (int i = 0; i < SingleProjects.count(); ++i) {
         VCFilter filter;
@@ -2541,7 +2541,7 @@ void VCProject::outputFileConfigs(XmlOutput &xml,
         if (filter.Config) // only if the filter is not empty
             filter.outputFileConfig(xml, info.file);
     }
-    xml << closetag(_File);
+    xml << closetag(q_File);
 }
 
 // outputs a given filter for all existing configurations of a project
@@ -2636,7 +2636,7 @@ XmlOutput &operator<<(XmlOutput &xml, VCProject &tool)
     for (int i = 0; i < tool.SingleProjects.count(); ++i)
         xml     << tool.SingleProjects.at(i).Configuration;
     xml     << closetag(_Configurations)
-            << tag(_Files);
+            << tag(q_Files);
     tool.outputFilter(xml, "Sources");
     tool.outputFilter(xml, "Headers");
     tool.outputFilter(xml, "GeneratedFiles");
@@ -2648,7 +2648,7 @@ XmlOutput &operator<<(XmlOutput &xml, VCProject &tool)
         tool.outputFilter(xml, tool.ExtraCompilers.at(x));
     }
     tool.outputFilter(xml, "RootFiles");
-    xml     << closetag(_Files)
+    xml     << closetag(q_Files)
             << tag(_Globals)
             << data(); // No "/>" end tag
     return xml;
diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp
index 2b60be6..538b0e7 100644
--- a/qmake/generators/win32/msvc_vcproj.cpp
+++ b/qmake/generators/win32/msvc_vcproj.cpp
@@ -120,14 +120,7 @@ static QString readRegistryKey(HKEY parentHandle, const QString &rSubkey)
     QString rSubkeyPath = keyPath(rSubkey);
 
     HKEY handle = 0;
-    LONG res;
-    QT_WA( {
-        res = RegOpenKeyExW(parentHandle, (WCHAR*)rSubkeyPath.utf16(),
-                            0, KEY_READ, &handle);
-    } , {
-        res = RegOpenKeyExA(parentHandle, rSubkeyPath.toLocal8Bit(),
-                            0, KEY_READ, &handle);
-    } );
+    LONG res = RegOpenKeyEx(parentHandle, (wchar_t*)rSubkeyPath.utf16(), 0, KEY_READ, &handle);
 
     if (res != ERROR_SUCCESS)
         return QString();
@@ -135,11 +128,7 @@ static QString readRegistryKey(HKEY parentHandle, const QString &rSubkey)
     // get the size and type of the value
     DWORD dataType;
     DWORD dataSize;
-    QT_WA( {
-        res = RegQueryValueExW(handle, (WCHAR*)rSubkeyName.utf16(), 0, &dataType, 0, &dataSize);
-    }, {
-        res = RegQueryValueExA(handle, rSubkeyName.toLocal8Bit(), 0, &dataType, 0, &dataSize);
-    } );
+    res = RegQueryValueEx(handle, (wchar_t*)rSubkeyName.utf16(), 0, &dataType, 0, &dataSize);
     if (res != ERROR_SUCCESS) {
         RegCloseKey(handle);
         return QString();
@@ -147,13 +136,8 @@ static QString readRegistryKey(HKEY parentHandle, const QString &rSubkey)
 
     // get the value
     QByteArray data(dataSize, 0);
-    QT_WA( {
-        res = RegQueryValueExW(handle, (WCHAR*)rSubkeyName.utf16(), 0, 0,
-                               reinterpret_cast<unsigned char*>(data.data()), &dataSize);
-    }, {
-        res = RegQueryValueExA(handle, rSubkeyName.toLocal8Bit(), 0, 0,
-                               reinterpret_cast<unsigned char*>(data.data()), &dataSize);
-    } );
+    res = RegQueryValueEx(handle, (wchar_t*)rSubkeyName.utf16(), 0, 0,
+                          reinterpret_cast<unsigned char*>(data.data()), &dataSize);
     if (res != ERROR_SUCCESS) {
         RegCloseKey(handle);
         return QString();
@@ -163,11 +147,7 @@ static QString readRegistryKey(HKEY parentHandle, const QString &rSubkey)
     switch (dataType) {
         case REG_EXPAND_SZ:
         case REG_SZ: {
-            QT_WA( {
-                result = QString::fromUtf16(((const ushort*)data.constData()));
-            }, {
-                result = QString::fromLatin1(data.constData());
-            } );
+            result = QString::fromWCharArray(((const wchar_t *)data.constData()));
             break;
         }
 
@@ -175,12 +155,7 @@ static QString readRegistryKey(HKEY parentHandle, const QString &rSubkey)
             QStringList l;
             int i = 0;
             for (;;) {
-                QString s;
-                QT_WA( {
-                    s = QString::fromUtf16((const ushort*)data.constData() + i);
-                }, {
-                    s = QString::fromLatin1(data.constData() + i);
-                } );
+                QString s = QString::fromWCharArray((const wchar_t *)data.constData() + i);
                 i += s.length() + 1;
 
                 if (s.isEmpty())
@@ -193,11 +168,7 @@ static QString readRegistryKey(HKEY parentHandle, const QString &rSubkey)
 
         case REG_NONE:
         case REG_BINARY: {
-            QT_WA( {
-                result = QString::fromUtf16((const ushort*)data.constData(), data.size()/2);
-            }, {
-                result = QString::fromLatin1(data.constData(), data.size());
-            } );
+            result = QString::fromWCharArray((const wchar_t *)data.constData(), data.size() / 2);
             break;
         }
 
@@ -1268,9 +1239,8 @@ void VcprojGenerator::initDeploymentTool()
     foreach(QString item, project->values("DEPLOYMENT")) {
         // get item.path
         QString devicePath = project->first(item + ".path");
-        // if the path does not exist, skip it
         if (devicePath.isEmpty())
-            continue;
+            devicePath = targetPath;
         // check if item.path is relative (! either /,\ or %)
         if (!(devicePath.at(0) == QLatin1Char('/')
             || devicePath.at(0) == QLatin1Char('\\')