diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2016-11-24 10:34:04 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2016-11-24 10:34:04 +0100 |
| commit | da4d5bd985454fe2dc5fbe44c92b81a94b525088 (patch) | |
| tree | 34819bb7b5c9a3f721c567f3f664bfe4d6048f2e /tools/qmake | |
| parent | b44962c8bce5489deee289212282cdf2c89b425a (diff) | |
| parent | 95a22234a4671e6e79ce1cecbd720551a185d278 (diff) | |
Merge branch '5.6' into 5.7
Conflicts:
src/core/api/qwebengineurlrequestinfo.cpp
src/core/api/qwebengineurlrequestinfo.h
src/core/core_gyp_generator.pro
Change-Id: I5c78f0c86f6dcd61697148f0729d3d3a2cb2c76f
Diffstat (limited to 'tools/qmake')
| -rw-r--r-- | tools/qmake/mkspecs/features/functions.prf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf index 23be1d2fa..c8fd278b4 100644 --- a/tools/qmake/mkspecs/features/functions.prf +++ b/tools/qmake/mkspecs/features/functions.prf @@ -155,7 +155,7 @@ defineReplace(getConfigDir) { } defineReplace(getChromiumSrcDir) { - git_chromium_src_dir = $$system("git config qtwebengine.chromiumsrcdir") + exists($$QTWEBENGINE_ROOT/.git): git_chromium_src_dir = $$system("git config qtwebengine.chromiumsrcdir") # Fall back to the snapshot path if git does not know about chromium sources (i.e. init-repository.py has not been used) isEmpty(git_chromium_src_dir): git_chromium_src_dir = "src/3rdparty/chromium" return($$git_chromium_src_dir) |