diff options
| author | Arvid Nilsson <anilsson@blackberry.com> | 2014-01-27 14:37:54 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-27 15:01:43 +0100 |
| commit | df7196dc8e733a6707663f055c7572a7fea2f08e (patch) | |
| tree | 72784e48af03688a32efeda157e0bd90fde8f77f /tools/qmake/mkspecs/features | |
| parent | dd978a5cf338421569f87541942078728edf15ff (diff) | |
Support absolute path in chromiumsrcdir
Use the second parameter of $$absolute_path to resolve the
git config value qtwebengine.chromiumsrcdir, in case it's already
absolute.
Change-Id: I68caf5c2f208d3caae69c1f6f361c916ce3f3d93
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'tools/qmake/mkspecs/features')
| -rw-r--r-- | tools/qmake/mkspecs/features/default_pre.prf | 2 | ||||
| -rw-r--r-- | tools/qmake/mkspecs/features/functions.prf | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tools/qmake/mkspecs/features/default_pre.prf b/tools/qmake/mkspecs/features/default_pre.prf index cec9be1bd..6a02a6bbd 100644 --- a/tools/qmake/mkspecs/features/default_pre.prf +++ b/tools/qmake/mkspecs/features/default_pre.prf @@ -8,7 +8,7 @@ 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" -CHROMIUM_SRC_DIR = $$absolute_path("$$QTWEBENGINE_ROOT/$$git_chromium_src_dir") +CHROMIUM_SRC_DIR = $$absolute_path("$$git_chromium_src_dir", "$$QTWEBENGINE_ROOT") INCLUDEPATH += $$CHROMIUM_SRC_DIR diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf index 73907227a..d4fdf6393 100644 --- a/tools/qmake/mkspecs/features/functions.prf +++ b/tools/qmake/mkspecs/features/functions.prf @@ -94,8 +94,8 @@ defineReplace(findOrBuildNinja) { 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" - win32: out = $$system_path($$absolute_path("$$QTWEBENGINE_ROOT/$$git_chromium_src_dir/../ninja/ninja.exe")) - else: out = $$absolute_path("$$QTWEBENGINE_ROOT/$$git_chromium_src_dir/../ninja/ninja") + win32: out = $$system_path($$absolute_path("$$git_chromium_src_dir/../ninja/ninja.exe", "$$QTWEBENGINE_ROOT")) + else: out = $$absolute_path("$$git_chromium_src_dir/../ninja/ninja", "$$QTWEBENGINE_ROOT") # If we still did not find ninja, then we bootstrap it. !exists($$out) { message("bootstrapping ninja...") |