Skip to content

Commit dd367ff

Browse files
committed
build: macdeploy: filter out irrelevant qt5 frameworks and dylibs
1 parent 9fedafb commit dd367ff

File tree

1 file changed

+23
-3
lines changed

1 file changed

+23
-3
lines changed

contrib/macdeploy/macdeployqtplus

Lines changed: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -393,15 +393,31 @@ def deployPlugins(appBundleInfo, deploymentInfo, strip, verbose):
393393
# Deploy the script plugins only if QtScript is in use
394394
if not deploymentInfo.usesFramework("QtScript"):
395395
continue
396-
elif pluginDirectory == "qmltooling":
396+
elif pluginDirectory == "qmltooling" or pluginDirectory == "qml1tooling":
397397
# Deploy the qml plugins only if QtDeclarative is in use
398398
if not deploymentInfo.usesFramework("QtDeclarative"):
399399
continue
400400
elif pluginDirectory == "bearer":
401401
# Deploy the bearer plugins only if QtNetwork is in use
402402
if not deploymentInfo.usesFramework("QtNetwork"):
403403
continue
404-
404+
elif pluginDirectory == "position":
405+
# Deploy the position plugins only if QtPositioning is in use
406+
if not deploymentInfo.usesFramework("QtPositioning"):
407+
continue
408+
elif pluginDirectory == "sensors" or pluginDirectory == "sensorgestures":
409+
# Deploy the sensor plugins only if QtSensors is in use
410+
if not deploymentInfo.usesFramework("QtSensors"):
411+
continue
412+
elif pluginDirectory == "audio" or pluginDirectory == "playlistformats":
413+
# Deploy the audio plugins only if QtMultimedia is in use
414+
if not deploymentInfo.usesFramework("QtMultimedia"):
415+
continue
416+
elif pluginDirectory == "mediaservice":
417+
# Deploy the mediaservice plugins only if QtMultimediaWidgets is in use
418+
if not deploymentInfo.usesFramework("QtMultimediaWidgets"):
419+
continue
420+
405421
for pluginName in filenames:
406422
pluginPath = os.path.join(pluginDirectory, pluginName)
407423
if pluginName.endswith("_debug.dylib"):
@@ -419,7 +435,11 @@ def deployPlugins(appBundleInfo, deploymentInfo, strip, verbose):
419435
# Deploy the opengl graphicssystem plugin only if QtOpenGL is in use
420436
if not deploymentInfo.usesFramework("QtOpenGL"):
421437
continue
422-
438+
elif pluginPath == "accessible/libqtaccessiblequick.dylib":
439+
# Deploy the accessible qtquick plugin only if QtQuick is in use
440+
if not deploymentInfo.usesFramework("QtQuick"):
441+
continue
442+
423443
plugins.append((pluginDirectory, pluginName))
424444

425445
for pluginDirectory, pluginName in plugins:

0 commit comments

Comments
 (0)