diff options
| author | Pierre Rossi <pierre.rossi@digia.com> | 2013-12-04 18:27:24 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-12-05 14:16:08 +0100 |
| commit | 8e0283cb450746cba967bf2d78b2d627e9202fe6 (patch) | |
| tree | 19f879cc0ff80f77a55a30faa481d1406bb5d2ce /src | |
| parent | 0331220e19c396a5a96797fddf9fe848d02f46a4 (diff) | |
Use files for install instead of extra
We need to add the no_check_exist value in order for qmake to just accept
that those files will eventually exist.
This has the benefits of not messing with $(INSTALL_ROOT) and also
stripping the library, which could prove useful.
Change-Id: I43c230f185420ba92ff8e86f49b4e838ca5dd917
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/core.pro | 2 | ||||
| -rw-r--r-- | src/core/core_gyp_generator.pro | 17 |
2 files changed, 7 insertions, 12 deletions
diff --git a/src/core/core.pro b/src/core/core.pro index 273f2b7e7..bd228c20a 100644 --- a/src/core/core.pro +++ b/src/core/core.pro @@ -22,8 +22,10 @@ SUBDIRS += core_gyp_generator \ REPACK_DIR = $$getOutDir()/$$getConfigDir()/gen/repack locales.files = $$REPACK_DIR/qtwebengine_locales +locales.CONFIG += no_check_exist locales.path = $$[QT_INSTALL_TRANSLATIONS] resources.files = $$REPACK_DIR/qtwebengine_resources.pak +resources.CONFIG += no_check_exist resources.path = $$[QT_INSTALL_DATA] INSTALLS += locales resources diff --git a/src/core/core_gyp_generator.pro b/src/core/core_gyp_generator.pro index f03757a3a..1cfcc4609 100644 --- a/src/core/core_gyp_generator.pro +++ b/src/core/core_gyp_generator.pro @@ -79,15 +79,8 @@ 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 -} +OUTPUT_DIR = $$getOutDir()/$$getConfigDir() +target.files = $$OUTPUT_DIR/lib/lib$${TARGET}.so +target.CONFIG += no_check_exist # Trust us, qmake... +target.path = $$[QT_INSTALL_LIBS] +INSTALLS += target |