Merge remote branch 'origin/4.7' into qt-master-from-4.7

Conflicts:
	mkspecs/features/symbian/application_icon.prf
	src/sql/drivers/odbc/qsql_odbc.cpp

2 files changed, 59 insertions, 58 deletions

diff --git a/mkspecs/common/symbian/symbian.conf b/mkspecs/common/symbian/symbian.conf
index 37bbb82..006a2da 100644
--- a/mkspecs/common/symbian/symbian.conf
+++ b/mkspecs/common/symbian/symbian.conf
@@ -215,19 +215,14 @@ default_deployment.pkg_prerules += pkg_depends_webkit pkg_depends_qt pkg_platfor
 DEPLOYMENT += default_deployment default_bin_deployment default_resource_deployment default_reg_deployment
 
 defineReplace(symbianRemoveSpecialCharacters) {
-    # Produce identical string to what SymbianCommonGenerator::removeSpecialCharacters and
-    # SymbianCommonGenerator::removeEpocSpecialCharacters produce
+    # Produce identical string to what SymbianCommonGenerator::removeSpecialCharacters
 
     fixedStr = $$1
 
     fixedStr = $$replace(fixedStr, /,_)
     fixedStr = $$replace(fixedStr, \\\\,_)
     fixedStr = $$replace(fixedStr, " ",_)
-    symbian-abld|symbian-sbsv2 {
-        fixedStr = $$replace(fixedStr, -,_)
-        fixedStr = $$replace(fixedStr, \\.,_)
-        fixedStr = $$replace(fixedStr, :,_)
-    }
+    fixedStr = $$replace(fixedStr, :,_)
 
     return ($$fixedStr)
 }
diff --git a/mkspecs/features/symbian/application_icon.prf b/mkspecs/features/symbian/application_icon.prf
index f50e944..d9918bf 100644
--- a/mkspecs/features/symbian/application_icon.prf
+++ b/mkspecs/features/symbian/application_icon.prf
@@ -12,69 +12,75 @@ contains(CONFIG, no_icon) {
 
 !contains(CONFIG, no_icon) {
     baseTarget = $$symbianRemoveSpecialCharacters($$basename(TARGET))
-    symbian-abld|symbian-sbsv2 {
-        resourceZDir = $$EPOCROOT$$HW_ZDIR$$APP_RESOURCE_DIR
-        regZDir = $$EPOCROOT$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR
+    contains(baseTarget, "^.*\\..*$") {
+        CONFIG += no_icon
+        ICON =
+        warning("Symbian resources do not support '.' character in TARGET, skipping resource generation.")
     } else {
-        contains(DESTDIR, "/.*") {
-            resourceZDir = $$DESTDIR
-        } else:isEmpty(DESTDIR) {
-            resourceZDir = $$OUT_PWD
+        symbian-abld|symbian-sbsv2 {
+            resourceZDir = $$EPOCROOT$$HW_ZDIR$$APP_RESOURCE_DIR
+            regZDir = $$EPOCROOT$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR
         } else {
-            resourceZDir = $$OUT_PWD/$$DESTDIR
+            contains(DESTDIR, "/.*") {
+                resourceZDir = $$DESTDIR
+            } else:isEmpty(DESTDIR) {
+                resourceZDir = $$OUT_PWD
+            } else {
+                resourceZDir = $$OUT_PWD/$$DESTDIR
+            }
+            regZDir = $$resourceZDir
         }
-        regZDir = $$resourceZDir
-    }
 
-    default_resource_deployment.files += $$resourceZDir/$${baseTarget}.rsc
-    default_resource_deployment.path = $$APP_RESOURCE_DIR
-    default_reg_deployment.files += $$regZDir/$${baseTarget}_reg.rsc
-    default_reg_deployment.path = $$REG_RESOURCE_IMPORT_DIR
+        default_resource_deployment.files += $$resourceZDir/$${baseTarget}.rsc
+        default_resource_deployment.path = $$APP_RESOURCE_DIR
+        default_reg_deployment.files += $$regZDir/$${baseTarget}_reg.rsc
+        default_reg_deployment.path = $$REG_RESOURCE_IMPORT_DIR
 
-    !isEmpty(ICON) {
-        !count(ICON, 1) {
-            ICON = $$first(ICON)
-            warning("Only first icon specified in ICON variable is used: $$ICON")
-        }
+        !isEmpty(ICON) {
+            !count(ICON, 1) {
+                ICON = $$first(ICON)
+                warning("Only first icon specified in ICON variable is used: $$ICON")
+            }
 
-        # Note: symbian-sbsv2 builds can't utilize extra compiler for mifconv, so ICON handling is done in code
-        !symbian-sbsv2 {
-            # Absolute path required for shadow builds.
-            # However, in older Symbian environments abld toolchain can't handle even moderately long
-            # paths, so don't force absolute there.
-            !symbian-abld:!contains(ICON, "^(/|\\\\|.:).*"):ICON = $$_PRO_FILE_PWD_/$$ICON
+            # Note: symbian-sbsv2 builds can't utilize extra compiler for mifconv, so ICON handling is done in code
+            !symbian-sbsv2 {
+                # Absolute path required for shadow builds.
+                # However, in older Symbian environments abld toolchain can't handle even moderately long
+                # paths, so don't force absolute there.
+                !symbian-abld:!contains(ICON, "^(/|\\\\|.:).*"):ICON = $$_PRO_FILE_PWD_/$$ICON
 
-            #Makefile: requires paths with backslash
-            ICON_backslashed = $$ICON
+                #Makefile: requires paths with backslash
+                ICON_backslashed = $$ICON
 
-            symbian-abld {
-                # ${ZDIR} is defined in Makefile
-                mifIconZDir = ${ZDIR}$$APP_RESOURCE_DIR
-            } else {
-                mifIconZDir = $$resourceZDir
-            }
+                symbian-abld {
+                    # ${ZDIR} is defined in Makefile
+                    mifIconZDir = ${ZDIR}$$APP_RESOURCE_DIR
+                } else {
+                    mifIconZDir = $$resourceZDir
+                }
 
-            # Extra compiler rules for mifconv
-            mifconv.target = $$mifIconZDir/$${baseTarget}.mif
-            contains(QMAKE_HOST.os, "Windows") {
-                ICON_backslashed = $$replace(ICON_backslashed, /, \\)
-                mifconv.target = $$replace(mifconv.target, /, \\)
-            }
-            # Based on: http://www.forum.nokia.com/document/Cpp_Developers_Library
-            # svg-t icons should always use /c32 depth
-            mifconv.commands = mifconv $$mifconv.target /c32 $$ICON_backslashed
+                # Extra compiler rules for mifconv
+                mifconv.target = $$mifIconZDir/$${baseTarget}.mif
+                contains(QMAKE_HOST.os, "Windows") {
+                    ICON_backslashed = $$replace(ICON_backslashed, /, \\)
+                    mifconv.target = $$replace(mifconv.target, /, \\)
+                }
+                # Based on: http://www.forum.nokia.com/document/Cpp_Developers_Library
+                # svg-t icons should always use /c32 depth
+                mifconv.commands = mifconv $$mifconv.target /c32 $$ICON_backslashed
 
-            mifconv.depends = $$ICON
-            PRE_TARGETDEPS += $$mifconv.target
-            QMAKE_EXTRA_TARGETS += mifconv
-            QMAKE_DISTCLEAN += $$mifconv.target
-        }
-        # Rules to use generated MIF file from symbian resources
-        RSS_RULES.number_of_icons = $$size(ICON_backslashed)
+                mifconv.depends = $$ICON
+                PRE_TARGETDEPS += $$mifconv.target
+                QMAKE_EXTRA_TARGETS += mifconv
+                QMAKE_CLEAN += $$mifconv.target
+            }
+            # Rules to use generated MIF file from symbian resources
+            RSS_RULES.number_of_icons = $$size(ICON_backslashed)
 
-        RSS_RULES.icon_file = $$APP_RESOURCE_DIR/$${baseTarget}.mif                
+            RSS_RULES.icon_file = $$APP_RESOURCE_DIR/$${baseTarget}.mif                
 
-        default_resource_deployment.files += $$resourceZDir/$${baseTarget}.mif
+            default_resource_deployment.files += $$resourceZDir/$${baseTarget}.mif
+        }
     }
 }