Skip to content

Commit 1ac7b7f

Browse files
committed
scripts: filter more qt plugins we don't use in macdeployqtplus
phonon is no longer a part of Qt as of version 5
1 parent 57cdd06 commit 1ac7b7f

File tree

1 file changed

+46
-4
lines changed

1 file changed

+46
-4
lines changed

contrib/macdeploy/macdeployqtplus

Lines changed: 46 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -373,10 +373,12 @@ def deployPlugins(appBundleInfo: ApplicationBundleInfo, deploymentInfo: Deployme
373373
if pluginDirectory == "designer":
374374
# Skip designer plugins
375375
continue
376-
elif pluginDirectory == "phonon" or pluginDirectory == "phonon_backend":
377-
# Deploy the phonon plugins only if phonon is in use
378-
if not deploymentInfo.usesFramework("phonon"):
379-
continue
376+
elif pluginDirectory == "printsupport":
377+
# Skip printsupport plugins
378+
continue
379+
elif pluginDirectory == "imageformats":
380+
# Skip imageformats plugins
381+
continue
380382
elif pluginDirectory == "sqldrivers":
381383
# Deploy the sql plugins only if QtSql is in use
382384
if not deploymentInfo.usesFramework("QtSql"):
@@ -409,6 +411,42 @@ def deployPlugins(appBundleInfo: ApplicationBundleInfo, deploymentInfo: Deployme
409411
# Deploy the mediaservice plugins only if QtMultimediaWidgets is in use
410412
if not deploymentInfo.usesFramework("QtMultimediaWidgets"):
411413
continue
414+
elif pluginDirectory == "canbus":
415+
# Deploy the canbus plugins only if QtSerialBus is in use
416+
if not deploymentInfo.usesFramework("QtSerialBus"):
417+
continue
418+
elif pluginDirectory == "webview":
419+
# Deploy the webview plugins only if QtWebView is in use
420+
if not deploymentInfo.usesFramework("QtWebView"):
421+
continue
422+
elif pluginDirectory == "gamepads":
423+
# Deploy the webview plugins only if QtGamepad is in use
424+
if not deploymentInfo.usesFramework("QtGamepad"):
425+
continue
426+
elif pluginDirectory == "geoservices":
427+
# Deploy the webview plugins only if QtLocation is in use
428+
if not deploymentInfo.usesFramework("QtLocation"):
429+
continue
430+
elif pluginDirectory == "texttospeech":
431+
# Deploy the texttospeech plugins only if QtTextToSpeech is in use
432+
if not deploymentInfo.usesFramework("QtTextToSpeech"):
433+
continue
434+
elif pluginDirectory == "virtualkeyboard":
435+
# Deploy the virtualkeyboard plugins only if QtVirtualKeyboard is in use
436+
if not deploymentInfo.usesFramework("QtVirtualKeyboard"):
437+
continue
438+
elif pluginDirectory == "sceneparsers":
439+
# Deploy the virtualkeyboard plugins only if Qt3DCore is in use
440+
if not deploymentInfo.usesFramework("Qt3DCore"):
441+
continue
442+
elif pluginDirectory == "renderplugins":
443+
# Deploy the renderplugins plugins only if Qt3DCore is in use
444+
if not deploymentInfo.usesFramework("Qt3DCore"):
445+
continue
446+
elif pluginDirectory == "geometryloaders":
447+
# Deploy the geometryloaders plugins only if Qt3DCore is in use
448+
if not deploymentInfo.usesFramework("Qt3DCore"):
449+
continue
412450

413451
for pluginName in filenames:
414452
pluginPath = os.path.join(pluginDirectory, pluginName)
@@ -431,6 +469,10 @@ def deployPlugins(appBundleInfo: ApplicationBundleInfo, deploymentInfo: Deployme
431469
# Deploy the accessible qtquick plugin only if QtQuick is in use
432470
if not deploymentInfo.usesFramework("QtQuick"):
433471
continue
472+
elif pluginPath == "platforminputcontexts/libqtvirtualkeyboardplugin.dylib":
473+
# Deploy the virtualkeyboardplugin plugin only if QtVirtualKeyboard is in use
474+
if not deploymentInfo.usesFramework("QtVirtualKeyboard"):
475+
continue
434476

435477
plugins.append((pluginDirectory, pluginName))
436478

0 commit comments

Comments
 (0)