From f531f865084d6858ac5de19bf99b4bdabb39e735 Mon Sep 17 00:00:00 2001 From: Morten Johan Sorvig Date: Thu, 24 May 2012 13:23:10 +0200 Subject: Update macdeployqt plugin deployment logic. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Handle qmltooling, graphics system and bearer plugins. Change-Id: I6f75dc600255013b88558d265a1b1ed25369f8e9 Reviewed-by: Bradley T. Hughes Reviewed-by: Morten Johan Sørvig --- tools/macdeployqt/shared/shared.cpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/tools/macdeployqt/shared/shared.cpp b/tools/macdeployqt/shared/shared.cpp index 39e98f6..6d601da 100644 --- a/tools/macdeployqt/shared/shared.cpp +++ b/tools/macdeployqt/shared/shared.cpp @@ -503,10 +503,18 @@ void deployPlugins(const ApplicationBundleInfo &appBundleInfo, const QString &pl if (useDebugLibs && !pluginName.endsWith("_debug.dylib")) continue; + // Skip the qmltooling plugins in release mode or when QtDeclarative is not used. + if (pluginSourcePath.contains("qmltooling") && (!useDebugLibs || deployedFrameworks.indexOf("QtDeclarative.framework") == -1)) + continue; + // Skip the designer plugins if (pluginSourcePath.contains("plugins/designer")) continue; + // Skipt the tracing graphics system + if (pluginName.contains("libqtracegraphicssystem")) + continue; + #ifndef QT_GRAPHICSSYSTEM_OPENGL // SKip the opengl graphicssystem plugin when not in use. if (pluginName.contains("libqglgraphicssystem")) @@ -531,6 +539,10 @@ void deployPlugins(const ApplicationBundleInfo &appBundleInfo, const QString &pl // Deploy the script plugins if QtScript.framework is in use if (deployedFrameworks.indexOf("QtScript.framework") == -1 && pluginName.contains("script")) continue; + + // Deploy the bearer plugins if QtNetwork.framework is in use + if (deployedFrameworks.indexOf("QtNetwork.framework") == -1 && pluginName.contains("bearer")) + continue; } QDir dir; -- cgit v0.12