diff options
| author | Adam Kallai <kadam@inf.u-szeged.hu> | 2014-05-12 01:43:33 -0700 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-05-12 19:11:32 +0200 |
| commit | 8447559996dabbc3205a738340d9843aa3c61457 (patch) | |
| tree | 476117089a3dc785f0d802981ba19f43d2ede87c | |
| parent | 55f1130be067fbf32f4be6953d3cea6cb72705b9 (diff) | |
| download | qtwebengine-8447559996dabbc3205a738340d9843aa3c61457.tar.gz | |
Fix the Chromium upstream initialization on Windows.
The Windows git version is not able to check out some extra_os
dependencies but since they are not relevant on Windows
we can just skip them.
Change-Id: I552e0c3a3bf2f26a8e44901ee700d6e19c138b45
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
| -rw-r--r-- | tools/scripts/git_submodule.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/tools/scripts/git_submodule.py b/tools/scripts/git_submodule.py index ba08a4e2c..48913cb72 100644 --- a/tools/scripts/git_submodule.py +++ b/tools/scripts/git_submodule.py @@ -142,12 +142,16 @@ class Submodule: return True if 'all' in self.os: return True - if (sys.platform.startswith('win32') or sys.platform.startswith('cygwin')) and 'win' in self.os: - return True if sys.platform.startswith('linux') and 'unix' in self.os: return True if sys.platform.startswith('darwin') and ('unix' in self.os or 'mac' in self.os): return True + if sys.platform.startswith('win32') or sys.platform.startswith('cygwin'): + if 'win' in self.os: + return True + else: + # Skipping all dependecies of the extra_os on Windows platform, because it caused confict. + return False for os in extra_os: if os in self.os: return True |