Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  ComboBox popuplist is not correctly layouted in fullscreen mode
  Stylus menu for Share (QT app) is different from native S60 apps
  Change $${EPOCROOT} to also have drive if EPOCROOT env variable has it
  Stylus menu for Share (QT app) is different from native S60 apps

2 files changed, 3 insertions, 4 deletions

diff --git a/qmake/generators/symbian/symbiancommon.cpp b/qmake/generators/symbian/symbiancommon.cpp
index 58729d2..3a4bdbc 100644
--- a/qmake/generators/symbian/symbiancommon.cpp
+++ b/qmake/generators/symbian/symbiancommon.cpp
@@ -433,9 +433,6 @@ void SymbianCommonGenerator::generatePkgFile(const QString &iconFile, bool epocB
                 if (from.size() > 1 && from.at(1) == QLatin1Char(':'))
                     from = from.mid(2);
                 from.prepend(zDir);
-            } else {
-                if (from.size() > 1 && from.at(1) == QLatin1Char(':'))
-                    from = from.mid(2);
             }
         }
 
diff --git a/qmake/generators/symbian/symmake_sbsv2.cpp b/qmake/generators/symbian/symmake_sbsv2.cpp
index c2f1d1a..78f6f85 100644
--- a/qmake/generators/symbian/symmake_sbsv2.cpp
+++ b/qmake/generators/symbian/symmake_sbsv2.cpp
@@ -99,7 +99,9 @@ void SymbianSbsv2MakefileGenerator::writeSbsDeploymentList(const DeploymentList&
         fromItem.replace("\\", "/");
         toItem.replace("\\", "/");
 #if defined(Q_OS_WIN)
-        toItem.prepend(QDir::current().absolutePath().left(2)); // add drive
+        // add drive if it doesn't have one yet
+        if (toItem.size() > 1 && toItem[1] != QLatin1Char(':'))
+            toItem.prepend(QDir::current().absolutePath().left(2));
 #endif
         t << "OPTION DEPLOY_SOURCE " << fromItem << endl;
         t << "OPTION DEPLOY_TARGET " << toItem << endl;