summaryrefslogtreecommitdiffstats
path: root/tools/buildscripts/qtwebengine_utils.py
diff options
context:
space:
mode:
authorZeno Albisser <zeno.albisser@digia.com>2014-08-22 17:53:05 +0200
committerZeno Albisser <zeno.albisser@digia.com>2014-08-26 21:58:27 +0200
commit085aa0d44337e468595b74dd691c29a41d7a4f56 (patch)
tree2bd517e5821d73cf6db586445c86ad8caad71544 /tools/buildscripts/qtwebengine_utils.py
parentf9c1fb9a88144aa546879085f74eb701651b9593 (diff)
When comparing paths in python we have to use normcase.
Chromium requires relative paths for output-dir and for generator-output. Also output-dir is expected to be a subdirectory of generator-output. This now allows building on windows without running qmake in recursive mode. Change-Id: Ie0f9965c1fbfd63eb3cb9c360b29f210128a5c3e Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'tools/buildscripts/qtwebengine_utils.py')
-rwxr-xr-xtools/buildscripts/qtwebengine_utils.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/buildscripts/qtwebengine_utils.py b/tools/buildscripts/qtwebengine_utils.py
index 1b629c65c..ccc112b11 100755
--- a/tools/buildscripts/qtwebengine_utils.py
+++ b/tools/buildscripts/qtwebengine_utils.py
@@ -62,5 +62,5 @@ def getChromiumSrcDir():
print('Using external chromium sources specified in git config qtwebengine.chromiumsrcdir: ' + chrome_src)
if not chrome_src or not os.path.isdir(chrome_src):
chrome_src = os.path.normpath(os.path.join(qtwebengine_root, 'src/3rdparty/chromium'))
- return chrome_src
+ return os.path.normcase(chrome_src)