From 97b8ba862bcfb47da1670247c231f38d6d14e840 Mon Sep 17 00:00:00 2001 From: atehxx Date: Fri, 30 Dec 2016 14:06:20 +0100 Subject: [PATCH] Update shared.cpp Fixed few paths to Web Engine resources as where they seem to be in 5.7.1 --- shared/shared.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/shared/shared.cpp b/shared/shared.cpp index 7332cb3..b04162d 100644 --- a/shared/shared.cpp +++ b/shared/shared.cpp @@ -894,23 +894,23 @@ void deployPlugins(const AppDirInfo &appDirInfo, const QString &pluginSourcePath sourcePath = pluginSourcePath + "/../libexec/QtWebEngineProcess"; destinationPath = pluginDestinationPath + "/../libexec/QtWebEngineProcess"; copyFilePrintStatus(sourcePath, destinationPath); - sourcePath = pluginSourcePath + "/../libexec/qtwebengine_resources.pak"; + sourcePath = pluginSourcePath + "/../resources/qtwebengine_resources.pak"; destinationPath = pluginDestinationPath + "/../resources/qtwebengine_resources.pak"; copyFilePrintStatus(sourcePath, destinationPath); - sourcePath = pluginSourcePath + "/../libexec/qtwebengine_devtools_resources.pak"; + sourcePath = pluginSourcePath + "/../resources/qtwebengine_devtools_resources.pak"; destinationPath = pluginDestinationPath + "/../resources/qtwebengine_devtools_resources.pak"; copyFilePrintStatus(sourcePath, destinationPath); - sourcePath = pluginSourcePath + "/../libexec/qtwebengine_resources_100p.pak"; + sourcePath = pluginSourcePath + "/../resources/qtwebengine_resources_100p.pak"; destinationPath = pluginDestinationPath + "/../resources/qtwebengine_resources_100p.pak"; copyFilePrintStatus(sourcePath, destinationPath); - sourcePath = pluginSourcePath + "/../libexec/qtwebengine_resources_200p.pak"; + sourcePath = pluginSourcePath + "/../resources/qtwebengine_resources_200p.pak"; destinationPath = pluginDestinationPath + "/../resources/qtwebengine_resources_200p.pak"; copyFilePrintStatus(sourcePath, destinationPath); - sourcePath = pluginSourcePath + "/../libexec/icudtl.dat"; + sourcePath = pluginSourcePath + "/../resources/icudtl.dat"; destinationPath = pluginDestinationPath + "/../resources/icudtl.dat"; copyFilePrintStatus(sourcePath, destinationPath); - sourcePath = pluginSourcePath + "/../libexec/qtwebengine_locales"; - destinationPath = pluginDestinationPath + "/../resources/"; + sourcePath = pluginSourcePath + "/../libexec/qtwebengine_locales"; // TODO: this is actually here ../translations/qtwebengine_locales + destinationPath = pluginDestinationPath + "/../resources/"; // TODO: find where to put it recursiveCopy(sourcePath, destinationPath); }