diff options
| -rw-r--r-- | src/core/core.pro | 27 | ||||
| -rw-r--r-- | src/core/core_module.pro | 26 |
2 files changed, 26 insertions, 27 deletions
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) |