From 84a400e80d7e40aba2853411fdfb22f244c3e728 Mon Sep 17 00:00:00 2001
From: Arvid Nilsson <anilsson@blackberry.com>
Date: Fri, 8 Nov 2013 10:23:08 +0100
Subject: [PATCH] Add INSTALLS to lib.pro and process.pro
The gyp output libQt5WebEngineCore.so wasn't installed anywhere when
you did "make install". The QtWebEngineProcess is not built by gyp but
nonetheless was not installed anywhere.
Fixed by adding some INSTALLS to lib.pro and process.pro. I made the
lib.pro INSTALL unix-specific for now because I'm not sure how to write
"extra" INSTALLS for macx and win.
Change-Id: Ic127ab79c5788988b4d12f741eece7afc71cf6ce
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
---
lib/lib.pro | 12 ++++++++++++
process/process.pro | 4 ++++
2 files changed, 16 insertions(+)
diff --git a/lib/lib.pro b/lib/lib.pro
index c1266626b..76924ecd4 100644
--- a/lib/lib.pro
+++ b/lib/lib.pro
@@ -84,3 +84,15 @@ HEADERS = \
web_event_factory.h \
yuv_video_node.h
+# It's difficult to convince the gyp/ninja combination to install the
+# output, so use qmake for that purpose. We need to use target.extra
+# rather than target.files since qmake is not convinced this file will
+# exist after the build completes.
+# FIXME: Remove this once we get rid of libQt5WebEngineCore.so and fold
+# the object files into libQt5WebEngine.so instead.
+unix {
+ OUTPUT_DIR = $$getOutDir()/$$getConfigDir()
+ target.extra = $(INSTALL_FILE) $$OUTPUT_DIR/lib/lib$${TARGET}.so $$[QT_INSTALL_LIBS]
+ target.path = $$[QT_INSTALL_LIBS]
+ INSTALLS += target
+}
diff --git a/process/process.pro b/process/process.pro
index 47a5839d8..6234d839f 100644
--- a/process/process.pro
+++ b/process/process.pro
@@ -15,3 +15,7 @@ DESTDIR = $$getOutDir()/$$getConfigDir()
INCLUDEPATH += ../lib
SOURCES = main.cpp
+
+target.files = $$DESTDIR/$$QTWEBENGINEPROCESS_NAME
+target.path = $$[QT_INSTALL_LIBEXECS]
+INSTALLS += target
--
GitLab