Skip to content

Commit da98f6d

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 cb7a27c commit da98f6d

File tree

1 file changed

+23
-4
lines changed

1 file changed

+23
-4
lines changed

contrib/macdeploy/macdeployqtplus

Lines changed: 23 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -373,10 +373,9 @@ 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
380379
elif pluginDirectory == "sqldrivers":
381380
# Deploy the sql plugins only if QtSql is in use
382381
if not deploymentInfo.usesFramework("QtSql"):
@@ -409,6 +408,26 @@ def deployPlugins(appBundleInfo: ApplicationBundleInfo, deploymentInfo: Deployme
409408
# Deploy the mediaservice plugins only if QtMultimediaWidgets is in use
410409
if not deploymentInfo.usesFramework("QtMultimediaWidgets"):
411410
continue
411+
elif pluginDirectory == "canbus":
412+
# Deploy the canbus plugins only if QtSerialBus is in use
413+
if not deploymentInfo.usesFramework("QtSerialBus"):
414+
continue
415+
elif pluginDirectory == "webview":
416+
# Deploy the webview plugins only if QtWebView is in use
417+
if not deploymentInfo.usesFramework("QtWebView"):
418+
continue
419+
elif pluginDirectory == "gamepads":
420+
# Deploy the webview plugins only if QtGamepad is in use
421+
if not deploymentInfo.usesFramework("QtGamepad"):
422+
continue
423+
elif pluginDirectory == "geoservices":
424+
# Deploy the webview plugins only if QtLocation is in use
425+
if not deploymentInfo.usesFramework("QtLocation"):
426+
continue
427+
elif pluginDirectory == "texttospeech":
428+
# Deploy the texttospeech plugins only if QtTextToSpeech is in use
429+
if not deploymentInfo.usesFramework("QtTextToSpeech"):
430+
continue
412431

413432
for pluginName in filenames:
414433
pluginPath = os.path.join(pluginDirectory, pluginName)

0 commit comments

Comments
 (0)