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 <zeno.albisser@digia.com>
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>

1 files changed, 3 insertions, 3 deletions

diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf
index 9d90d67bd..0d0d37954 100644
--- a/tools/qmake/mkspecs/features/functions.prf
+++ b/tools/qmake/mkspecs/features/functions.prf
@@ -28,7 +28,7 @@ defineReplace(findMocables) {
   input = $$1
   for (file, input): \
       infiles += $$absolute_path($$file, $$_PRO_FILE_PWD_)
-  mocables = $$system("python $$QTWEBENGINE_ROOT/build/scripts/find-mocables $$infiles")
+  mocables = $$system("python $$QTWEBENGINE_ROOT/tools/buildscripts/find-mocables $$infiles")
   mocables = $$replace(mocables, $$_PRO_FILE_PWD_$${QMAKE_DIR_SEP}, '')
   return($$mocables)
 }
@@ -37,7 +37,7 @@ defineReplace(findIncludedMocFiles) {
   input = $$1
   for (file, input): \
       infiles += $$absolute_path($$file, $$_PRO_FILE_PWD_)
-  return($$system("python $$QTWEBENGINE_ROOT/build/scripts/find-included-moc-files $$infiles"))
+  return($$system("python $$QTWEBENGINE_ROOT/tools/buildscripts/find-included-moc-files $$infiles"))
 }
 
 defineReplace(mocOutput) {
@@ -93,7 +93,7 @@ defineReplace(findOrBuildNinja) {
   !exists($$out) {
     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"
     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")
     # If we still did not find ninja, then we bootstrap it.