From 1c5e30928bd3ec31747276ff60940ec144a2cc16 Mon Sep 17 00:00:00 2001 From: Jocelyn Turcotte Date: Mon, 18 Nov 2013 14:23:25 +0100 Subject: Moving sources to src part 2: Adjust paths. NOTE: To build after this you should rerun init-repository.py or run $> git submodule sync $> git submodule update $> git config qtwebengine.chromiumsrcdir src/3rdparty This makes everything build by adjusting paths. Other mixed-in changes: - Rename qtwebengine_src variables in scripts to qtwebengine_root to avoid confusion. - Cleanup the release and debug extra targets that were in lib.pro. This file has also been split into src.pro and core.pro. Change-Id: Ieee9158a65f526b15244eaca59e779b7069d337e Reviewed-by: Zeno Albisser Reviewed-by: Pierre Rossi --- tools/qmake/mkspecs/features/default_pre.prf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tools/qmake/mkspecs/features/default_pre.prf') diff --git a/tools/qmake/mkspecs/features/default_pre.prf b/tools/qmake/mkspecs/features/default_pre.prf index 1e751b740..cec9be1bd 100644 --- a/tools/qmake/mkspecs/features/default_pre.prf +++ b/tools/qmake/mkspecs/features/default_pre.prf @@ -1,12 +1,12 @@ # Resolve root directories for sources -QTWEBENGINE_ROOT = $$replace(PWD, /build/qmake/mkspecs/features$,) +QTWEBENGINE_ROOT = $$replace(PWD, /tools/qmake/mkspecs/features$,) QTWEBENGINEPROCESS_NAME = QtWebEngineProcess 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 = "3rdparty/chromium" +isEmpty(git_chromium_src_dir): git_chromium_src_dir = "src/3rdparty/chromium" CHROMIUM_SRC_DIR = $$absolute_path("$$QTWEBENGINE_ROOT/$$git_chromium_src_dir") -- cgit v1.2.3