diff options
| author | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2014-08-07 17:34:27 +0200 |
|---|---|---|
| committer | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2014-08-14 16:43:41 +0200 |
| commit | 4be6a15559b0dfb7c53b72e2480ce8e09326b3c1 (patch) | |
| tree | 86b9aa9d6c00935d79e545578876aec68c143610 /src/core/config | |
| parent | 3a30ed4ecc9c828641daef85f88f93baf78826b6 (diff) | |
Fix the build on windows when qtwebengine.chromiumsrcdir isn't set
qtwe_chromium_obj_dir wasn't falling back to src/3rdparty if the
config couldn't be found in git.
Move the fallback logic to a getChromiumSrcDir qmake function, and
use it in both places.
The build system will now also print that the Chromium sources will
follow the git config if found instead of the other way around,
since this should now be the normal case as part of Qt5.
Change-Id: I5ab972ab53156c1bd033518e2eb51013559491ac
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'src/core/config')
| -rw-r--r-- | src/core/config/windows.pri | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/core/config/windows.pri b/src/core/config/windows.pri index e2b16d860..0828115b4 100644 --- a/src/core/config/windows.pri +++ b/src/core/config/windows.pri @@ -6,8 +6,7 @@ GYP_CONFIG += \ use_ash=0 \ # Libvpx build needs additional search path on Windows. -git_chromium_src_dir = $$system("git config qtwebengine.chromiumsrcdir") -GYP_ARGS += "-D qtwe_chromium_obj_dir=\"$$OUT_PWD/$$getConfigDir()/obj/$$git_chromium_src_dir\"" +GYP_ARGS += "-D qtwe_chromium_obj_dir=\"$$OUT_PWD/$$getConfigDir()/obj/$${getChromiumSrcDir()}\"" # Use path from environment for perl, bison and gperf instead of values set in WebKit's core.gypi. GYP_ARGS += "-D perl_exe=\"perl.exe\" -D bison_exe=\"bison.exe\" -D gperf_exe=\"gperf.exe\"" |