Merge commit 'origin/4.7' into symbian47

Conflicts:
	src/plugins/bearer/symbian/qnetworksession_impl.h

5 files changed, 14 insertions, 14 deletions

diff --git a/mkspecs/features/symbian/add_mmp_rules.prf b/mkspecs/features/symbian/add_mmp_rules.prf
index 5384dbe..7f96b81 100644
--- a/mkspecs/features/symbian/add_mmp_rules.prf
+++ b/mkspecs/features/symbian/add_mmp_rules.prf
@@ -23,7 +23,7 @@ defineTest(addMMPRules) {
                 # No value defined for current condition, so use default
                 varVal = $$eval($${var}.default)
             }
-            !isEmpty(varVal): libBlock += "$$join(varVal,$$escape_expand(\n))"
+            !isEmpty(varVal): libBlock += "$$join(varVal,$$escape_expand(\\n))"
         }
 
         MMP_RULES += $$libBlock
diff --git a/mkspecs/features/symbian/application_icon.prf b/mkspecs/features/symbian/application_icon.prf
index 76f9ba1..c5654d9 100644
--- a/mkspecs/features/symbian/application_icon.prf
+++ b/mkspecs/features/symbian/application_icon.prf
@@ -21,11 +21,11 @@ contains( CONFIG, no_icon ) {
         # only uses filename from RSS_RULES.icon_file when referring to icon file name.
         baseTarget = $$basename(TARGET)
         baseTarget = $$replace(baseTarget, /,_)
-        baseTarget = $$replace(baseTarget, \\,_)
+        baseTarget = $$replace(baseTarget, \\\\,_)
         baseTarget = $$replace(baseTarget, " ",_)
         symbian-abld|symbian-sbsv2 {
             baseTarget = $$replace(baseTarget, -,_)
-            baseTarget = $$replace(baseTarget, \.,_)
+            baseTarget = $$replace(baseTarget, \\.,_)
             baseTarget = $$replace(baseTarget, :,_)
         }
 
diff --git a/mkspecs/features/symbian/def_files.prf b/mkspecs/features/symbian/def_files.prf
index 8bcd096..eb17402 100644
--- a/mkspecs/features/symbian/def_files.prf
+++ b/mkspecs/features/symbian/def_files.prf
@@ -63,7 +63,7 @@ symbian-abld|symbian-sbsv2 {
     freeze_target.target = freeze
     freeze_target.depends = first
     # The perl part is to convert to unix line endings and remove comments, which the s60 tools refuse to do.
-    freeze_target.commands = perl -n -e \'next if (/; NEW/); s/\r//g; if (/MISSING:(.*)/x) { print(\"\$\$1 ABSENT\\n\"); } else { print; }\' < $$symbianObjdir/$${TARGET}.def >  $$elf2e32FileToAdd
+    freeze_target.commands = perl -n -e \'next if (/; NEW/); s/\\r//g; if (/MISSING:(.*)/x) { print(\"\$\$1 ABSENT\\n\"); } else { print; }\' < $$symbianObjdir/$${TARGET}.def >  $$elf2e32FileToAdd
     QMAKE_EXTRA_TARGETS += freeze_target
 } else:contains(TEMPLATE, subdirs) {
     freeze_target.target = freeze
diff --git a/mkspecs/features/symbian/moc.prf b/mkspecs/features/symbian/moc.prf
index 29e0d8d..6030944 100644
--- a/mkspecs/features/symbian/moc.prf
+++ b/mkspecs/features/symbian/moc.prf
@@ -1,17 +1,17 @@
 load(moc)
 
 symbian-abld|symbian-sbsv2 {
-    RET = $$find(MOC_DIR, "(/|^)\.[^/]+/?$")
+    RET = $$find(MOC_DIR, "(/|^)\\.[^/]+/?$")
     !isEmpty(RET):{
         error("Symbian does not support directories starting with a dot. Please set MOC_DIR to a different value in your profile. MOC_DIR: $$MOC_DIR")
     }
 
-    RET = $$find(RCC_DIR, "(/|^)\.[^/]+/?$")
+    RET = $$find(RCC_DIR, "(/|^)\\.[^/]+/?$")
     !isEmpty(RET):{
         error("Symbian does not support directories starting with a dot. Please set RCC_DIR to a different value in your profile. RCC_DIR: $$RCC_DIR")
     }
 
-    RET = $$find(OBJECTS_DIR, "(/|^)\.[^/]+/?$")
+    RET = $$find(OBJECTS_DIR, "(/|^)\\.[^/]+/?$")
     !isEmpty(RET):{
         error("Symbian does not support directories starting with a dot. Please set OBJECTS_DIR to a different value in your profile. OBJECTS_DIR: $$OBJECTS_DIR")
     }
diff --git a/mkspecs/features/symbian/symbian_building.prf b/mkspecs/features/symbian/symbian_building.prf
index 802adde..c230272 100644
--- a/mkspecs/features/symbian/symbian_building.prf
+++ b/mkspecs/features/symbian/symbian_building.prf
@@ -22,16 +22,16 @@ contains(QMAKE_CFLAGS, "--thumb")|contains(QMAKE_CXXFLAGS, "--thumb")|contains(Q
 }
 
 defineReplace(processSymbianLibraries) {
-    library = $$replace(1, "\.dll$", ".dso")
+    library = $$replace(1, "\\.dll$", ".dso")
     library = $$replace(library, "^-l", "")
-    isFullName = $$find(library, \.)
+    isFullName = $$find(library, \\.)
     isEmpty(isFullName):library="$${library}.dso"
     linux-gcce {
         newLIB = "-l:$${library}"
     } else {
         newLIB = "$${library}"
     }
-    contains(library, "\.dso$")|contains(library, ".lib$"):PRE_TARGETDEPS += $$library
+    contains(library, "\\.dso$")|contains(library, "\\.lib$"):PRE_TARGETDEPS += $$library
     return($$newLIB)
 }
 
@@ -55,7 +55,7 @@ isEmpty(VERSION) {
 }
 
 # Check for version validity.
-!isEmpty(VERSION):!contains(VERSION, "[0-9]+"):!contains(VERSION, "[0-9]+\.[0-9]+")!contains(VERSION, "[0-9]+(\.[0-9]+){2}") {
+!isEmpty(VERSION):!contains(VERSION, "[0-9]+"):!contains(VERSION, "[0-9]+\\.[0-9]+")!contains(VERSION, "[0-9]+(\\.[0-9]+){2}") {
     error("Invalid VERSION for Symbian: $$VERSION")
 }
 
@@ -86,7 +86,7 @@ isEmpty(TARGET.UID2):TARGET.UID2 = 0x00000000
 
 capability = $$replace(TARGET.CAPABILITY, " ", "+")
 capability = $$join(capability, "+")
-capability = $$replace(capability, "\+-", "-")
+capability = $$replace(capability, "\\+-", "-")
 isEmpty(capability): capability = "None"
 capability = "--capability=$$capability"
 
@@ -214,9 +214,9 @@ symbian_resources_INCLUDES += "-I $$symbian_resources_RCC_DIR"
 
 for(symbian_resource, SYMBIAN_RESOURCES) {
     symbian_resource = $$basename(symbian_resource)
-    symbian_resource_clean = $$replace(symbian_resource, "\.rss$", ".rsc")
+    symbian_resource_clean = $$replace(symbian_resource, "\\.rss$", ".rsc")
     QMAKE_DISTCLEAN += $${symbianDestdir}/$${symbian_resource_clean}
-    symbian_resource_clean = $$replace(symbian_resource, "\.rss$", ".rpp")
+    symbian_resource_clean = $$replace(symbian_resource, "\\.rss$", ".rpp")
     QMAKE_CLEAN += $${symbian_resources_RCC_DIR}/$${symbian_resource_clean}
 }