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, 0 insertions, 25 deletions

diff --git a/src/macdeployqt/shared/shared.cpp b/src/macdeployqt/shared/shared.cpp
index b830c6a02..c01d0c896 100644
--- a/src/macdeployqt/shared/shared.cpp
+++ b/src/macdeployqt/shared/shared.cpp
@@ -1261,8 +1261,6 @@ bool deployQmlImports(const QString &appBundlePath, DeploymentInfo deploymentInf
         return false;
     }
 
-    bool qtQuickContolsInUse = false; // condition for QtQuick.PrivateWidgets below
-
     // sort imports to deploy a module before its sub-modules (otherwise
     // deployQmlImports can consider the module deployed if it has already
     // deployed one of its sub-module)
@@ -1276,9 +1274,6 @@ bool deployQmlImports(const QString &appBundlePath, DeploymentInfo deploymentInf
         QString path = import["path"].toString();
         QString type = import["type"].toString();
 
-        if (import["name"] == "QtQuick.Controls")
-            qtQuickContolsInUse = true;
-
         LogNormal() << "Deploying QML import" << name;
 
         // Skip imports with missing info - path will be empty if the import is not found.
@@ -1308,26 +1303,6 @@ bool deployQmlImports(const QString &appBundlePath, DeploymentInfo deploymentInf
         deployQmlImport(appBundlePath, deploymentInfo.rpathsUsed, path, name);
         LogNormal() << "";
     }
-
-    // Special case:
-    // Use of QtQuick.PrivateWidgets is not discoverable at deploy-time.
-    // Recreate the run-time logic here as best as we can - deploy it iff
-    //      1) QtWidgets.framework is used
-    //      2) QtQuick.Controls is used
-    // The intended failure mode is that libwidgetsplugin.dylib will be present
-    // in the app bundle but not used at run-time.
-
-    // Check if Qt was configured with -libinfix
-    const QString libInfixWithFramework = getLibInfix(deploymentInfo.deployedFrameworks) + QStringLiteral(".framework");
-
-    if (deploymentInfo.deployedFrameworks.contains(QStringLiteral("QtWidgets") + libInfixWithFramework)
-            && qtQuickContolsInUse) {
-        LogNormal() << "Deploying QML import QtQuick.PrivateWidgets";
-        QString name = "QtQuick/PrivateWidgets";
-        QString path = qmlImportsPath + QLatin1Char('/') + name;
-        deployQmlImport(appBundlePath, deploymentInfo.rpathsUsed, path, name);
-        LogNormal() << "";
-    }
     return true;
 }