Rename remaining references of blinq to QtWebEngine.

5 files changed, 11 insertions, 11 deletions

diff --git a/build/build.pro b/build/build.pro
index 0c3c87ba3..a2fa634e6 100644
--- a/build/build.pro
+++ b/build/build.pro
@@ -1,11 +1,11 @@
 # This .pro file serves a dual purpose:
-# 1) invoking gyp through the gyp_blinq script, which in turn makes use of the generated gypi include files
+# 1) invoking gyp through the gyp_qtwebengine script, which in turn makes use of the generated gypi include files
 # 2) produce a Makefile that will run ninja, and take care of actually building everything.
 
 TEMPLATE = aux
 
 message(Running Gyp...)
-GYP_OUTPUT = $$system(./gyp_blinq)
+GYP_OUTPUT = $$system(./gyp_qtwebengine)
 message($$GYP_OUTPUT)
 
 ninja.target = ninja
diff --git a/build/gyp_blinq b/build/gyp_qtwebengine
index 51d2f4cdc..89d0cfcd3 100755
--- a/build/gyp_blinq
+++ b/build/gyp_qtwebengine
@@ -80,7 +80,7 @@ if __name__ == '__main__':
       break
 
   if not gyp_file_specified:
-      args.append(os.path.join(root_dir, 'blinq.gyp'))
+      args.append(os.path.join(root_dir, 'qtwebengine.gyp'))
 
   args.extend(['-I' + i for i in additional_include_files(args)])
 
@@ -111,7 +111,7 @@ if __name__ == '__main__':
   args.extend(['--generator-output', os.path.abspath(get_output_dir())])
   args.extend(['-Goutput_dir='+ os.path.abspath(get_output_dir())])
   args.extend(['--format=ninja'])
-  if "BLINQ_GYP_DEBUG" in os.environ:
+  if "QTWEBENGINE_GYP_DEBUG" in os.environ:
     args.append("--check")
     args.append("-d all")
     print args
diff --git a/build/qmake/mkspecs/features/default_pre.prf b/build/qmake/mkspecs/features/default_pre.prf
index 07ec22750..a49ab6bbf 100644
--- a/build/qmake/mkspecs/features/default_pre.prf
+++ b/build/qmake/mkspecs/features/default_pre.prf
@@ -1,7 +1,7 @@
 # Resolve root directories for sources
-BLINQ_ROOT = $$replace(PWD, /build/qmake/mkspecs/features$,)
+QTWEBENGINE_ROOT = $$replace(PWD, /build/qmake/mkspecs/features$,)
 
-BLINQ_PROCESS_NAME = blinq_process
+QTWEBENGINEPROCESS_NAME = QtWebEngineProcess
 
 # Fetched from environment for now
 CHROMIUM_SRC_DIR = $$(CHROMIUM_SRC_DIR)
diff --git a/build/qmake/mkspecs/features/functions.prf b/build/qmake/mkspecs/features/functions.prf
index bb1e152a2..0f65c77ae 100644
--- a/build/qmake/mkspecs/features/functions.prf
+++ b/build/qmake/mkspecs/features/functions.prf
@@ -9,8 +9,8 @@ defineReplace(toGypTargetType) {
 }
 
 defineReplace(getOutDir) {
-  # FIXME: rely on env variable in here and in the gyp_blinq script, à la WEBKITOUTPUTDIR
-  return("$$BLINQ_ROOT/out")
+  # FIXME: rely on env variable in here and in the gyp_qtwebengine script, à la WEBKITOUTPUTDIR
+  return("$$QTWEBENGINE_ROOT/out")
 }
 
 defineReplace(getConfigDir) {
@@ -22,7 +22,7 @@ defineReplace(findMocables) {
   input = $$1
   for (file, input): \
       infiles += $$absolute_path($$file, $$_PRO_FILE_PWD_)
-  mocables = $$system("$$BLINQ_ROOT/build/scripts/find-mocables $$infiles")
+  mocables = $$system("$$QTWEBENGINE_ROOT/build/scripts/find-mocables $$infiles")
   mocables = $$replace(mocables, $$_PRO_FILE_PWD_$${QMAKE_DIR_SEP}, '')
   return($$mocables)
 }
diff --git a/build/qmake/mkspecs/features/gyp_generator.prf b/build/qmake/mkspecs/features/gyp_generator.prf
index 5cf0e3eb5..2cb652331 100644
--- a/build/qmake/mkspecs/features/gyp_generator.prf
+++ b/build/qmake/mkspecs/features/gyp_generator.prf
@@ -42,7 +42,7 @@ GYPI_CONTENTS =  "{" \
                  "    'target_name': '$$TARGET'," \
                  "    'type': '$$TARGET_TYPE'," \
                  "    'includes': [" \
-                 "      '../blinq.gypi'," \
+                 "      '../qtwebengine.gypi'," \
                  "    ]," \
                  "    'ldflags': ["
 for (lib, LIBS): GYPI_CONTENTS += "      '$$lib',"
@@ -100,7 +100,7 @@ GYPI_CONTENTS += "  }," \
 write_file($$GYPI_FILE, GYPI_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 $$BLINQ_ROOT/build/build.pro")
+unix: phony_variable_name_for_qmake_to_be_happy=$$system("touch $$QTWEBENGINE_ROOT/build/build.pro")
 
 # The generated Makefile shouldn't build anything by itself, just re-run qmake if necessary
 TEMPLATE = aux