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>

3 files changed, 8 insertions, 8 deletions

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")
 
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.
diff --git a/tools/qmake/mkspecs/features/gyp_generator.prf b/tools/qmake/mkspecs/features/gyp_generator.prf
index d15b864c9..ad87f5673 100644
--- a/tools/qmake/mkspecs/features/gyp_generator.prf
+++ b/tools/qmake/mkspecs/features/gyp_generator.prf
@@ -55,7 +55,7 @@ defineReplace(rccAction) {
     return($$contents)
 }
 
-GYPI_FILE = $$replace(_PRO_FILE_, .pro$, .gyp)
+isEmpty(GYPFILE): GYPFILE = $$replace(_PRO_FILE_, .pro$, .gyp)
 
 TARGET_TYPE = $$toGypTargetType()
 MOCABLE_HEADERS = $$findMocables($$HEADERS)
@@ -196,10 +196,10 @@ GYP_CONTENTS += "    ]," \
 GYP_CONTENTS += "  ]," \
                 "}"
 
-!build_pass: write_file($$GYPI_FILE, GYP_CONTENTS)
+!build_pass: write_file($$GYPFILE, GYP_CONTENTS)
 
 # Overwriting the generated gyp file seems like a good reason to re-gyp
-unix: phony_variable_name_for_qmake_to_be_happy=$$system("touch $$QTWEBENGINE_ROOT/build/build.pro")
+unix: phony_variable_name_for_qmake_to_be_happy=$$system("touch $$QTWEBENGINE_ROOT/src/core/gyp_run.pro")
 
 # The generated Makefile shouldn't build anything by itself, just re-run qmake if necessary
 TEMPLATE = aux