diff options
| author | Joerg Bornemann <joerg.bornemann@theqtcompany.com> | 2016-01-12 15:31:47 +0100 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@theqtcompany.com> | 2016-01-12 15:38:44 +0000 |
| commit | c6e9cc7c848182e5277b9811bceff76cf2f054ef (patch) | |
| tree | aa9b41f57699956978df1ca1e73f8204f36ae1b0 | |
| parent | f0644bd7992da4125bd307ee72d49b40ef589805 (diff) | |
windeployqt: Fix QtWebEngineWidgets-based projects
We must deploy QtWebEngineProcess.exe and the resource files for every
project that depends on QtWebEngineCore.
Before, deployment took place for QtWebEngine-based projects only, i.e.
projects using the WebEngine QML API.
Change-Id: I8d5371dbdedc6766343a77755d2a91445decbdb3
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
| -rw-r--r-- | src/windeployqt/main.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/windeployqt/main.cpp b/src/windeployqt/main.cpp index 28f636f83..85dddfb35 100644 --- a/src/windeployqt/main.cpp +++ b/src/windeployqt/main.cpp @@ -1467,8 +1467,8 @@ static bool deployWebProcess(const QMap<QString, QString> &qmakeVariables, return deploy(options, qmakeVariables, errorMessage); } -static bool deployWebEngine(const QMap<QString, QString> &qmakeVariables, - const Options &options, QString *errorMessage) +static bool deployWebEngineCore(const QMap<QString, QString> &qmakeVariables, + const Options &options, QString *errorMessage) { static const char *installDataFiles[] = {"icudtl.dat", "qtwebengine_resources.pak", @@ -1580,8 +1580,8 @@ int main(int argc, char **argv) } } - if (result.deployedQtLibraries & QtWebEngineModule) { - if (!deployWebEngine(qmakeVariables, options, &errorMessage)) { + if (result.deployedQtLibraries & QtWebEngineCoreModule) { + if (!deployWebEngineCore(qmakeVariables, options, &errorMessage)) { std::wcerr << errorMessage << '\n'; return 1; } |