diff options
author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2011-01-27 10:40:33 (GMT) |
---|---|---|
committer | Jason McDonald <jason.mcdonald@nokia.com> | 2011-01-31 13:06:43 (GMT) |
commit | 884dc710553c44277504245dc908f96731da84ed (patch) | |
tree | 19777fa18f0adab84d8ee4e9ad1a860fe6eb3e82 /mkspecs/common | |
parent | c403773accc3b3e9d90df54663efa6f5ff116bee (diff) | |
download | Qt-884dc710553c44277504245dc908f96731da84ed.zip Qt-884dc710553c44277504245dc908f96731da84ed.tar.gz Qt-884dc710553c44277504245dc908f96731da84ed.tar.bz2 |
No longer replace dash and dot in TARGET with underscore in Symbian
There is no fundamental reason to not have dash or dot in binary names
in Symbian, so do not replace them with underscore.
One thing that doesn't work with a dot in the filename is launching
an application via resources, so automatic resource generation is
suppressed for applications that have a dot in filename portion of
the TARGET value.
Task-number: QTBUG-16888
Reviewed-by: axis
(cherry picked from commit 4ec245a3e75470186557d00b2383af3872a720b0)
Diffstat (limited to 'mkspecs/common')
-rw-r--r-- | mkspecs/common/symbian/symbian.conf | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/mkspecs/common/symbian/symbian.conf b/mkspecs/common/symbian/symbian.conf index 00cf0d7..f8473ed 100644 --- a/mkspecs/common/symbian/symbian.conf +++ b/mkspecs/common/symbian/symbian.conf @@ -212,19 +212,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) } |