diff options
| author | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2015-09-25 17:19:48 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2015-09-28 10:06:14 +0000 |
| commit | a13743adec73f61fc8d381dee9f83449e2286653 (patch) | |
| tree | 40ee445fff56681f4d7d0f6bb24454e0743d00eb /src/windeployqt/main.cpp | |
| parent | f1c2855c2cb169480ab104a61f644390a23ec41b (diff) | |
| download | qttools-a13743adec73f61fc8d381dee9f83449e2286653.tar.gz | |
windeployqt: Workaround for QtQuick.PrivateWidgets
Deploy PrivateWidgets if QtWidgets and QtQuick.Controls are in use
similar to how macdeployqt handles it.
Task-number: QTBUG-48424
Task-number: QTBUG-45977
Change-Id: Ia9d836b86edbe9d1f75ec5ec74edf66dc321b24b
Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>
Diffstat (limited to 'src/windeployqt/main.cpp')
| -rw-r--r-- | src/windeployqt/main.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/windeployqt/main.cpp b/src/windeployqt/main.cpp index d66db6758..724214a53 100644 --- a/src/windeployqt/main.cpp +++ b/src/windeployqt/main.cpp @@ -1233,8 +1233,10 @@ static DeployResult deploy(const Options &options, foreach (const QString &qmlDirectory, qmlDirectories) { if (optVerboseLevel >= 1) std::wcout << "Scanning " << QDir::toNativeSeparators(qmlDirectory) << ":\n"; - const QmlImportScanResult scanResult = runQmlImportScanner(qmlDirectory, qmakeVariables.value(QStringLiteral("QT_INSTALL_QML")), options.platform, - debugMatchMode, errorMessage); + const QmlImportScanResult scanResult = + runQmlImportScanner(qmlDirectory, qmakeVariables.value(QStringLiteral("QT_INSTALL_QML")), + result.directlyUsedQtLibraries & QtWidgetsModule, + options.platform, debugMatchMode, errorMessage); if (!scanResult.ok) return result; qmlScanResult.append(scanResult); |