summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoraxis <qt-info@nokia.com>2010-03-23 10:00:40 (GMT)
committeraxis <qt-info@nokia.com>2010-03-23 10:06:50 (GMT)
commit21ca1f5e48a978c76ef7d39628226b5afba2d1a8 (patch)
tree955f5b8d48df4344b545b85afd2734fa2d31bb58
parent069853c579f57177f83e5d98aca3cfd5ac809961 (diff)
downloadQt-21ca1f5e48a978c76ef7d39628226b5afba2d1a8.zip
Qt-21ca1f5e48a978c76ef7d39628226b5afba2d1a8.tar.gz
Qt-21ca1f5e48a978c76ef7d39628226b5afba2d1a8.tar.bz2
Fixed regular expression matching.
We need extra backslashes, otherwise it tries to match the '|' verbatim.
-rw-r--r--mkspecs/features/symbian/application_icon.prf2
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/features/symbian/application_icon.prf b/mkspecs/features/symbian/application_icon.prf
index ecf987d..b583313 100644
--- a/mkspecs/features/symbian/application_icon.prf
+++ b/mkspecs/features/symbian/application_icon.prf
@@ -31,7 +31,7 @@ contains( CONFIG, no_icon ) {
# Note: symbian-sbsv2 builds can't utilize extra compiler for mifconv, so ICON handling is done in code
!symbian-sbsv2 {
- !contains(ICON, "^(/|\\|.:).*"):ICON = $$_PRO_FILE_PWD_/$$ICON #absolute path
+ !contains(ICON, "^(/|\\\\|.:).*"):ICON = $$_PRO_FILE_PWD_/$$ICON #absolute path
#Makefile: requires paths with backslash
ICON_backslashed = $$ICON
contains(QMAKE_HOST.os, "Windows"):ICON_backslashed = $$replace( ICON_backslashed, /, \\)