1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

windeployqt: deployWebProcess: Copy QtWebEngineProcess.exe to --libdir

Browse Source 
When the executable is deployed using the CMake deployment API, `QtWebEngineProcess.exe` should be copied into the same folder where the deployed project executable is, which is 'bin'.

https://doc.qt.io/qt-6/qtwebengine-deploying.html#deploying-qt-webengine-processes

In the previous implementation, the `--dir` argument is used as the
target directory. This commit changes the target directory for
`QtWebEngineProcess.exe` from `--dir` to `--libdir`.

Pick-to: 6.7
Fixes: QTBUG-126572
Change-Id: I07abfc789d439ac66a9ff2706de52a05d80e9b51
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
(cherry picked from commit e56d98cea0c422827cd72c6cb4d7ee43143d5bac)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Orkun Tokdemir 2024-08-14 10:20:44 +02:00 committed by Qt Cherry-pick Bot
parent 12bca46996
commit b856d2f248
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/tools/windeployqt/main.cpp
View File

@ -1823,10 +1823,14 @@ static bool deployWebProcess(const QMap<QString, QString> &qtpathsVariables, con
const QString webProcess = webProcessBinary(binaryName, sourceOptions.platform);
const QString webProcessSource = qtpathsVariables.value(QStringLiteral("QT_INSTALL_LIBEXECS"))
+ u'/' + webProcess;
if (!updateFile(webProcessSource, sourceOptions.directory, sourceOptions.updateFileFlags, sourceOptions.json, errorMessage))
const QString webProcessTargetDir = sourceOptions.platform & WindowsBased
&& !sourceOptions.libraryDirectory.isEmpty() ?
sourceOptions.libraryDirectory :
sourceOptions.directory;
if (!updateFile(webProcessSource, webProcessTargetDir, sourceOptions.updateFileFlags, sourceOptions.json, errorMessage))
return false;
Options options(sourceOptions);
options.binaries.append(options.directory + u'/' + webProcess);
options.binaries.append(webProcessTargetDir + u'/' + webProcess);
options.quickImports = false;
options.translations = false;
return deploy(options, qtpathsVariables, pluginInfo, errorMessage);