From b6a0cd76dbb29e288bb041aca3125801126f8810 Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
Date: Fri, 1 Jul 2016 15:54:16 +0200
Subject: Move core_generated.gyp to build directory
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Changes core_generated.gyp from being generated in the source directory
to being generated in the build directory.

Task-number: QTBUG-43014
Change-Id: Ia67df47bfadbf5dfca6e60a613dcf7b162b468fd
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
---
 src/3rdparty                     |  2 +-
 src/core/core.gyp                | 12 ------------
 src/core/core_gyp_generator.pro  |  6 ++++--
 src/core/gyp_run.pro             |  2 +-
 src/core/qtwebengine.gypi        |  2 +-
 src/core/resources/resources.gyp | 12 ++++++------
 6 files changed, 13 insertions(+), 23 deletions(-)
 delete mode 100644 src/core/core.gyp

(limited to 'src')

diff --git a/src/3rdparty b/src/3rdparty
index 79930a541..9d6566ee1 160000
--- a/src/3rdparty
+++ b/src/3rdparty
@@ -1 +1 @@
-Subproject commit 79930a541473b2e0f950d040c16ab6f22e4aeef3
+Subproject commit 9d6566ee193e8996fb867cf776dc13f697400f24
diff --git a/src/core/core.gyp b/src/core/core.gyp
deleted file mode 100644
index ea5478cf1..000000000
--- a/src/core/core.gyp
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  'targets': [
-  {
-    'target_name': 'qtwebengine',
-    'type': 'none',
-    'dependencies': [
-      'core_generated.gyp:*',
-      'resources/resources.gyp:*',
-    ],
-  },
-  ]
-}
diff --git a/src/core/core_gyp_generator.pro b/src/core/core_gyp_generator.pro
index 3fe66e41b..ec180d38e 100644
--- a/src/core/core_gyp_generator.pro
+++ b/src/core/core_gyp_generator.pro
@@ -2,8 +2,9 @@
 # We want the gyp generation step to happen after all the other config steps. For that we need to prepend
 # our gyp_generator.prf feature to the CONFIG variable since it is processed backwards
 CONFIG = gyp_generator $$CONFIG
-GYPFILE = $$PWD/core_generated.gyp
-GYPINCLUDES += qtwebengine.gypi
+GYPFILE = $$OUT_PWD/core_generated.gyp
+GYPINCLUDES += $$PWD/qtwebengine.gypi
+GYPSRCDIR = $$PWD
 
 TEMPLATE = lib
 
@@ -19,6 +20,7 @@ DEFINES += QT_NO_KEYWORDS \
 
 # Ensure that response files, generated by qtbase/mkspecs/features/moc.prf, are found by moc.
 MOC_DIR = $$OUT_PWD/$$getConfigDir()/.moc
+RCC_DIR = $$OUT_PWD/$$getConfigDir()/.rcc
 
 # Assume that we want mobile touch and low-end hardware behaviors
 # whenever we are cross compiling.
diff --git a/src/core/gyp_run.pro b/src/core/gyp_run.pro
index 36548ff6b..885df908c 100644
--- a/src/core/gyp_run.pro
+++ b/src/core/gyp_run.pro
@@ -120,7 +120,7 @@ contains(WEBENGINE_CONFIG, use_proprietary_codecs): GYP_CONFIG += proprietary_co
 for (config, GYP_CONFIG): GYP_ARGS += "-D $$config"
 
 !build_pass {
-    message("Running gyp_qtwebengine \"$$OUT_PWD\" $${GYP_ARGS}...")
+    message("Running gyp_qtwebengine \"$$OUT_PWD\" $${GYP_ARGS}.")
     !system("python $$QTWEBENGINE_ROOT/tools/buildscripts/gyp_qtwebengine \"$$OUT_PWD\" $${GYP_ARGS}"): error("-- running gyp_qtwebengine failed --")
 }
 
diff --git a/src/core/qtwebengine.gypi b/src/core/qtwebengine.gypi
index fc5f17281..585f22324 100644
--- a/src/core/qtwebengine.gypi
+++ b/src/core/qtwebengine.gypi
@@ -36,7 +36,7 @@
       '<(chromium_src_dir)/url/url.gyp:url_lib',
       '<(chromium_src_dir)/v8/tools/gyp/v8.gyp:v8',
 
-      'chrome_qt.gyp:chrome_qt',
+      '<(qtwebengine_root)/src/core/chrome_qt.gyp:chrome_qt',
     ],
     'include_dirs': [
       '<(chromium_src_dir)',
diff --git a/src/core/resources/resources.gyp b/src/core/resources/resources.gyp
index c37172a5c..9dcdaf0d1 100644
--- a/src/core/resources/resources.gyp
+++ b/src/core/resources/resources.gyp
@@ -13,16 +13,16 @@
     'qt_install_data%': '',
     'qt_install_translations%': '',
   },
-  'dependencies': [
-      '<(chromium_src_dir)/content/app/strings/content_strings.gyp:content_strings',
-      '<(chromium_src_dir)/blink/public/blink_resources.gyp:blink_resources',
-      '<(chromium_src_dir)/content/browser/devtools/devtools_resources.gyp:devtools_resources',
-      '../chrome_qt.gyp:chrome_resources',
-  ],
   'targets': [
   {
     'target_name': 'qtwebengine_resources',
     'type': 'none',
+    'dependencies': [
+        '<(chromium_src_dir)/content/app/strings/content_strings.gyp:content_strings',
+        '<(chromium_src_dir)/content/browser/devtools/devtools_resources.gyp:devtools_resources',
+        '<(chromium_src_dir)/third_party/WebKit/public/blink_resources.gyp:blink_resources',
+        '<(qtwebengine_root)/src/core/chrome_qt.gyp:chrome_resources',
+    ],
     'actions' : [
       {
         'action_name': 'repack_resources',
-- 
cgit v1.2.3