From fd47c264511e7dca55e666e49faa3a22612b584c Mon Sep 17 00:00:00 2001
From: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Date: Thu, 6 Nov 2014 11:33:47 +0100
Subject: Move extra installs from core.pro to core_module.pro

core_module.pro is the one responsible for deployment of the binary so
it makes sense to also let it handle the other files to install.

This leaves core.pro to only handle sub-projects dependencies.

Change-Id: Ibe433eceec7fb0a9f806dfa89dccb0bedeaccc59
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
---
 src/core/core.pro        | 27 ---------------------------
 src/core/core_module.pro | 26 ++++++++++++++++++++++++++
 2 files changed, 26 insertions(+), 27 deletions(-)

(limited to 'src')

diff --git a/src/core/core.pro b/src/core/core.pro
index 927f8bab4..cf00f39cb 100644
--- a/src/core/core.pro
+++ b/src/core/core.pro
@@ -28,30 +28,3 @@ SUBDIRS += core_gyp_generator \
     gyp_run.depends += gyp_configure_host gyp_configure_target
     SUBDIRS += gyp_configure_host gyp_configure_target
 }
-
-REPACK_DIR = $$OUT_PWD/$$getConfigDir()/gen/repack
-locales.files = "$$REPACK_DIR/qtwebengine_locales/*"
-locales.CONFIG += no_check_exist
-locales.path = $$[QT_INSTALL_TRANSLATIONS]/qtwebengine_locales
-resources.files = $$REPACK_DIR/qtwebengine_resources.pak
-resources.CONFIG += no_check_exist
-resources.path = $$[QT_INSTALL_DATA]
-
-PLUGIN_EXTENSION = .so
-PLUGIN_PREFIX = lib
-macx: PLUGIN_PREFIX =
-win32 {
-    PLUGIN_EXTENSION = .dll
-    PLUGIN_PREFIX =
-}
-
-icu.files = $$OUT_PWD/$$getConfigDir()/icudtl.dat
-icu.CONFIG += no_check_exist
-icu.path = $$[QT_INSTALL_DATA]
-
-plugins.files = $$OUT_PWD/$$getConfigDir()/$${PLUGIN_PREFIX}ffmpegsumo$${PLUGIN_EXTENSION}
-plugins.CONFIG += no_check_exist
-plugins.path = $$[QT_INSTALL_PLUGINS]/qtwebengine
-
-INSTALLS += icu locales resources plugins
-
diff --git a/src/core/core_module.pro b/src/core/core_module.pro
index 08e0b7822..3ba65e301 100644
--- a/src/core/core_module.pro
+++ b/src/core/core_module.pro
@@ -11,6 +11,32 @@ QT_PRIVATE += gui-private
     error("Could not find the linking information that gyp should have generated.")
 }
 
+REPACK_DIR = $$OUT_PWD/$$getConfigDir()/gen/repack
+locales.files = "$$REPACK_DIR/qtwebengine_locales/*"
+locales.CONFIG += no_check_exist
+locales.path = $$[QT_INSTALL_TRANSLATIONS]/qtwebengine_locales
+resources.files = $$REPACK_DIR/qtwebengine_resources.pak
+resources.CONFIG += no_check_exist
+resources.path = $$[QT_INSTALL_DATA]
+
+PLUGIN_EXTENSION = .so
+PLUGIN_PREFIX = lib
+osx: PLUGIN_PREFIX =
+win32 {
+    PLUGIN_EXTENSION = .dll
+    PLUGIN_PREFIX =
+}
+
+icu.files = $$OUT_PWD/$$getConfigDir()/icudtl.dat
+icu.CONFIG += no_check_exist
+icu.path = $$[QT_INSTALL_DATA]
+
+plugins.files = $$OUT_PWD/$$getConfigDir()/$${PLUGIN_PREFIX}ffmpegsumo$${PLUGIN_EXTENSION}
+plugins.CONFIG += no_check_exist
+plugins.path = $$[QT_INSTALL_PLUGINS]/qtwebengine
+
+INSTALLS += icu locales resources plugins
+
 # We distribute the module binary but headers are only available in-tree.
 CONFIG += no_module_headers
 load(qt_module)
-- 
cgit v1.2.3