QtQuick/Html apps: Fix some non-shadowbuild cases

If the .target of a .source/.target tuple is empty, we get a "//"
in the path. Let's replace it with a "/" before string-comparing
it to another path.

If the .target is just a "." like in the HTML template code, we get
to replace a "/./" with a "/".

Change-Id: I5b6fef93c3efd5a21f9461b6e85c76f13bfb75e1
Task-Id: QTBUG-21060
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>

diff --git a/share/qtcreator/templates/shared/deployment.pri b/share/qtcreator/templates/shared/deployment.pri
index 9fcc9f5..4ebaa74 100644 (file)
--- a/share/qtcreator/templates/shared/deployment.pri
+++ b/share/qtcreator/templates/shared/deployment.pri
@@ -29,6 +29,7 @@ symbian {
         sourcePathSegments = $$split(source, \\)
         target = $$OUT_PWD/$$eval($${deploymentfolder}.target)/$$last(sourcePathSegments)
         target = $$replace(target, /, \\)
+        target ~= s,\\\\\\.?\\\\,\\,
         !isEqual(source,$$target) {
             !isEmpty(copyCommand):copyCommand += &&
             isEqual(QMAKE_DIR_SEP, \\) {
@@ -73,6 +74,7 @@ symbian {
             target = $$replace(target, \\\\, /)
             sourcePathSegments = $$split(source, /)
             targetFullPath = $$target/$$last(sourcePathSegments)
+            targetFullPath ~= s,/\\.?/,/,
             !isEqual(source,$$targetFullPath) {
                 !isEmpty(copyCommand):copyCommand += &&
                 copyCommand += $(MKDIR) \"$$target\"

diff --git a/src/plugins/qt4projectmanager/wizards/abstractmobileapp.cpp b/src/plugins/qt4projectmanager/wizards/abstractmobileapp.cpp
index e671200..bf5396d 100644 (file)
--- a/src/plugins/qt4projectmanager/wizards/abstractmobileapp.cpp
+++ b/src/plugins/qt4projectmanager/wizards/abstractmobileapp.cpp
@@ -60,7 +60,7 @@ const QString AbstractMobileApp::ProFileComment(QLatin1String("#"));
 const QString AbstractMobileApp::DeploymentPriFileName(QLatin1String("deployment.pri"));
 const QString AbstractMobileApp::FileChecksum(QLatin1String("checksum"));
 const QString AbstractMobileApp::FileStubVersion(QLatin1String("version"));
-const int AbstractMobileApp::StubVersion = 6;
+const int AbstractMobileApp::StubVersion = 7;
 
 AbstractMobileApp::AbstractMobileApp()
     : QObject()