summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZoltan Arvai <zarvai@inf.u-szeged.hu>2014-02-20 17:20:57 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-02-28 13:39:19 +0100
commitebc0ea419431677da13f5d8086bffe32414ea180 (patch)
treee63c1ad542529d9a08601b1b5cc2eb6e38f32fb9
parent02cf9c842d408d26507b8f40d2e18a8b5c9bbc74 (diff)
GRIT should use unix file paths as dictionary keys on Windows
GRIT uses filename strings as keys in its dictionary so generated filenames must be exactly the same strings as they are defined in .grd files. GRIT expects forward slashes as path separator and also .grd files are containing forward slashes. Similar conversion used in the else section of the outer if statement in the same function. Change-Id: I81bbf2e15e7aaefb52176405990d49457fce1589 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
-rw-r--r--patches/chromium/tools/grit/0001-GRIT-Allow-grd-files-outside-of-chromium-source-dir.patch3
1 files changed, 2 insertions, 1 deletions
diff --git a/patches/chromium/tools/grit/0001-GRIT-Allow-grd-files-outside-of-chromium-source-dir.patch b/patches/chromium/tools/grit/0001-GRIT-Allow-grd-files-outside-of-chromium-source-dir.patch
index 9da214cc..3a703b8a 100644
--- a/patches/chromium/tools/grit/0001-GRIT-Allow-grd-files-outside-of-chromium-source-dir.patch
+++ b/patches/chromium/tools/grit/0001-GRIT-Allow-grd-files-outside-of-chromium-source-dir.patch
@@ -30,7 +30,7 @@ index 734c57a..33848b2 100755
return value
return ''
-@@ -427,6 +427,10 @@ class GritNode(base.Node):
+@@ -427,6 +427,11 @@ class GritNode(base.Node):
abs_filename = os.path.abspath(filename_or_stream)
if abs_filename[:len(src_root_dir)] != src_root_dir:
filename = os.path.basename(filename_or_stream)
@@ -38,6 +38,7 @@ index 734c57a..33848b2 100755
+ # found as a key, fall back to using the absolute file name.
+ if not filename in first_ids:
+ filename = abs_filename
++ filename = filename.replace('\\', '/')
else:
filename = abs_filename[len(src_root_dir) + 1:]
filename = filename.replace('\\', '/')