We no longer need a workaround to include PrivateWidgets

The dependencies are in place so it is no longer necessary to include
PrivateWidgets manually as it is correctly included automatically when
necessary.

Task-number: QTBUG-69299
Change-Id: I7cdebf8b3b4375b6f6c9360eb20676f406456ba6
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>

1 files changed, 1 insertions, 16 deletions

diff --git a/src/shared/winutils/qmlutils.cpp b/src/shared/winutils/qmlutils.cpp
index 52f044068..6fe77e64f 100644
--- a/src/shared/winutils/qmlutils.cpp
+++ b/src/shared/winutils/qmlutils.cpp
@@ -99,7 +99,7 @@ QmlImportScanResult runQmlImportScanner(const QString &directory, const QString
                                         bool usesWidgets, int platform, DebugMatchMode debugMatchMode,
                                         QString *errorMessage)
 {
-    bool quickControlsHandled = false;
+    Q_UNUSED(usesWidgets);
     QmlImportScanResult result;
     QStringList arguments;
     arguments << QStringLiteral("-importPath") << qmlImportPath << QStringLiteral("-rootPath") << directory;
@@ -136,21 +136,6 @@ QmlImportScanResult runQmlImportScanner(const QString &directory, const QString
                 module.relativePath = object.value(QStringLiteral("relativePath")).toString();
                 result.modules.append(module);
                 findFileRecursion(QDir(path), Platform(platform), debugMatchMode, &result.plugins);
-                // QTBUG-48424, QTBUG-45977: In release mode, qmlimportscanner does not report
-                // the dependency of QtQuick.Controls on QtQuick.PrivateWidgets due to missing files.
-                // Recreate the run-time logic here as best as we can - deploy it if
-                //      1) QtWidgets is used
-                //      2) QtQuick.Controls is used
-                if (!quickControlsHandled && usesWidgets && module.name == QLatin1String("QtQuick.Controls")) {
-                    quickControlsHandled = true;
-                    QmlImportScanResult::Module privateWidgetsModule;
-                    privateWidgetsModule.name = QStringLiteral("QtQuick.PrivateWidgets");
-                    privateWidgetsModule.className = QStringLiteral("QtQuick2PrivateWidgetsPlugin");
-                    privateWidgetsModule.sourcePath = QFileInfo(path).absolutePath() + QStringLiteral("/PrivateWidgets");
-                    privateWidgetsModule.relativePath = QStringLiteral("QtQuick/PrivateWidgets");
-                    result.modules.append(privateWidgetsModule);
-                    findFileRecursion(QDir(privateWidgetsModule.sourcePath), Platform(platform), debugMatchMode, &result.plugins);
-                }
             }
         }
     }