1 files changed, 137 insertions, 137 deletions

diff --git a/print/hplip/pkg-plist b/print/hplip/pkg-plist
index 8fe9441faa3a..58591ac7a077 100644
--- a/print/hplip/pkg-plist
+++ b/print/hplip/pkg-plist
@@ -556,141 +556,141 @@ share/hal/fdi/preprobe/10osvendor/20-hplip-devices.fdi
 %%DATADIR%%/testpage.py
 %%DATADIR%%/timedate.py
 %%DATADIR%%/toolbox.py
-%%QT4%%%%DATADIR%%/ui4/__init__.py
-%%QT4%%%%DATADIR%%/ui4/aboutdialog.py
-%%QT4%%%%DATADIR%%/ui4/aboutdialog_base.py
-%%QT4%%%%DATADIR%%/ui4/aligndialog.py
-%%QT4%%%%DATADIR%%/ui4/aligndialog_base.py
-%%QT4%%%%DATADIR%%/ui4/cleandialog.py
-%%QT4%%%%DATADIR%%/ui4/cleandialog_base.py
-%%QT4%%%%DATADIR%%/ui4/colorcaldialog.py
-%%QT4%%%%DATADIR%%/ui4/colorcaldialog_base.py
-%%QT4%%%%DATADIR%%/ui4/devicesetupdialog.py
-%%QT4%%%%DATADIR%%/ui4/devicesetupdialog_base.py
-%%QT4%%%%DATADIR%%/ui4/deviceuricombobox.py
-%%QT4%%%%DATADIR%%/ui4/devmgr5.py
-%%QT4%%%%DATADIR%%/ui4/devmgr5_base.py
-%%QT4%%%%DATADIR%%/ui4/fabgrouptable.py
-%%QT4%%%%DATADIR%%/ui4/fabnametable.py
-%%QT4%%%%DATADIR%%/ui4/fabwindow.py
-%%QT4%%%%DATADIR%%/ui4/fabwindow_base.py
-%%QT4%%%%DATADIR%%/ui4/faxsetupdialog.py
-%%QT4%%%%DATADIR%%/ui4/faxsetupdialog_base.py
-%%QT4%%%%DATADIR%%/ui4/filetable.py
-%%QT4%%%%DATADIR%%/ui4/firmwaredialog.py
-%%QT4%%%%DATADIR%%/ui4/firmwaredialog_base.py
-%%QT4%%%%DATADIR%%/ui4/infodialog.py
-%%QT4%%%%DATADIR%%/ui4/infodialog_base.py
-%%QT4%%%%DATADIR%%/ui4/linefeedcaldialog.py
-%%QT4%%%%DATADIR%%/ui4/linefeedcaldialog_base.py
-%%QT4%%%%DATADIR%%/ui4/loadpapergroupbox.py
-%%QT4%%%%DATADIR%%/ui4/makecopiesdialog.py
-%%QT4%%%%DATADIR%%/ui4/makecopiesdialog_base.py
-%%QT4%%%%DATADIR%%/ui4/mimetypesdialog.py
-%%QT4%%%%DATADIR%%/ui4/mimetypesdialog_base.py
-%%QT4%%%%DATADIR%%/ui4/nodevicesdialog.py
-%%QT4%%%%DATADIR%%/ui4/nodevicesdialog_base.py
-%%QT4%%%%DATADIR%%/ui4/plugindiagnose.py
-%%QT4%%%%DATADIR%%/ui4/plugindiagnose_base.py
-%%QT4%%%%DATADIR%%/ui4/plugindialog.py
-%%QT4%%%%DATADIR%%/ui4/plugindialog_base.py
-%%QT4%%%%DATADIR%%/ui4/pluginlicensedialog.py
-%%QT4%%%%DATADIR%%/ui4/pluginlicensedialog_base.py
-%%QT4%%%%DATADIR%%/ui4/pqdiagdialog.py
-%%QT4%%%%DATADIR%%/ui4/pqdiagdialog_base.py
-%%QT4%%%%DATADIR%%/ui4/printdialog.py
-%%QT4%%%%DATADIR%%/ui4/printdialog_base.py
-%%QT4%%%%DATADIR%%/ui4/printernamecombobox.py
-%%QT4%%%%DATADIR%%/ui4/printsettingsdialog.py
-%%QT4%%%%DATADIR%%/ui4/printsettingsdialog_base.py
-%%QT4%%%%DATADIR%%/ui4/printsettingstoolbox.py
-%%QT4%%%%DATADIR%%/ui4/printtestpagedialog.py
-%%QT4%%%%DATADIR%%/ui4/printtestpagedialog_base.py
-%%QT4%%%%DATADIR%%/ui4/queuesconf.py
-%%QT4%%%%DATADIR%%/ui4/readonlyradiobutton.py
-%%QT4%%%%DATADIR%%/ui4/sendfaxdialog.py
-%%QT4%%%%DATADIR%%/ui4/sendfaxdialog_base.py
-%%QT4%%%%DATADIR%%/ui4/settingsdialog.py
-%%QT4%%%%DATADIR%%/ui4/settingsdialog_base.py
-%%QT4%%%%DATADIR%%/ui4/setupdialog.py
-%%QT4%%%%DATADIR%%/ui4/setupdialog_base.py
-%%QT4%%%%DATADIR%%/ui4/systemtray.py
-%%QT4%%%%DATADIR%%/ui4/systrayframe.py
-%%QT4%%%%DATADIR%%/ui4/systrayframe_base.py
-%%QT4%%%%DATADIR%%/ui4/ui_utils.py
-%%QT4%%%%DATADIR%%/ui4/upgradedialog.py
-%%QT4%%%%DATADIR%%/ui4/upgradedialog_base.py
-%%QT4%%%%DATADIR%%/ui4/wifisetupdialog.py
-%%QT4%%%%DATADIR%%/ui4/wifisetupdialog_base.py
-%%QT5%%%%DATADIR%%/ui5/__init__.py
-%%QT5%%%%DATADIR%%/ui5/aboutdialog.py
-%%QT5%%%%DATADIR%%/ui5/aboutdialog_base.py
-%%QT5%%%%DATADIR%%/ui5/aligndialog.py
-%%QT5%%%%DATADIR%%/ui5/aligndialog_base.py
-%%QT5%%%%DATADIR%%/ui5/cleandialog.py
-%%QT5%%%%DATADIR%%/ui5/cleandialog_base.py
-%%QT5%%%%DATADIR%%/ui5/colorcaldialog.py
-%%QT5%%%%DATADIR%%/ui5/colorcaldialog_base.py
-%%QT5%%%%DATADIR%%/ui5/devicesetupdialog.py
-%%QT5%%%%DATADIR%%/ui5/devicesetupdialog_base.py
-%%QT5%%%%DATADIR%%/ui5/deviceuricombobox.py
-%%QT5%%%%DATADIR%%/ui5/devmgr5.py
-%%QT5%%%%DATADIR%%/ui5/devmgr5_base.py
-%%QT5%%%%DATADIR%%/ui5/devmgr_ext.py
-%%QT5%%%%DATADIR%%/ui5/fabgrouptable.py
-%%QT5%%%%DATADIR%%/ui5/fabnametable.py
-%%QT5%%%%DATADIR%%/ui5/fabwindow.py
-%%QT5%%%%DATADIR%%/ui5/fabwindow_base.py
-%%QT5%%%%DATADIR%%/ui5/faxsetupdialog.py
-%%QT5%%%%DATADIR%%/ui5/faxsetupdialog_base.py
-%%QT5%%%%DATADIR%%/ui5/filetable.py
-%%QT5%%%%DATADIR%%/ui5/firmwaredialog.py
-%%QT5%%%%DATADIR%%/ui5/firmwaredialog_base.py
-%%QT5%%%%DATADIR%%/ui5/infodialog.py
-%%QT5%%%%DATADIR%%/ui5/infodialog_base.py
-%%QT5%%%%DATADIR%%/ui5/linefeedcaldialog.py
-%%QT5%%%%DATADIR%%/ui5/linefeedcaldialog_base.py
-%%QT5%%%%DATADIR%%/ui5/loadpapergroupbox.py
-%%QT5%%%%DATADIR%%/ui5/makecopiesdialog.py
-%%QT5%%%%DATADIR%%/ui5/makecopiesdialog_base.py
-%%QT5%%%%DATADIR%%/ui5/mimetypesdialog.py
-%%QT5%%%%DATADIR%%/ui5/mimetypesdialog_base.py
-%%QT5%%%%DATADIR%%/ui5/nodevicesdialog.py
-%%QT5%%%%DATADIR%%/ui5/nodevicesdialog_base.py
-%%QT5%%%%DATADIR%%/ui5/plugindiagnose.py
-%%QT5%%%%DATADIR%%/ui5/plugindiagnose_base.py
-%%QT5%%%%DATADIR%%/ui5/plugindialog.py
-%%QT5%%%%DATADIR%%/ui5/plugindialog_base.py
-%%QT5%%%%DATADIR%%/ui5/pluginlicensedialog.py
-%%QT5%%%%DATADIR%%/ui5/pluginlicensedialog_base.py
-%%QT5%%%%DATADIR%%/ui5/pqdiagdialog.py
-%%QT5%%%%DATADIR%%/ui5/pqdiagdialog_base.py
-%%QT5%%%%DATADIR%%/ui5/printdialog.py
-%%QT5%%%%DATADIR%%/ui5/printdialog_base.py
-%%QT5%%%%DATADIR%%/ui5/printernamecombobox.py
-%%QT5%%%%DATADIR%%/ui5/printsettings_base.py
-%%QT5%%%%DATADIR%%/ui5/printsettingsdialog.py
-%%QT5%%%%DATADIR%%/ui5/printsettingsdialog_base.py
-%%QT5%%%%DATADIR%%/ui5/printsettingstoolbox.py
-%%QT5%%%%DATADIR%%/ui5/printtestpagedialog.py
-%%QT5%%%%DATADIR%%/ui5/printtestpagedialog_base.py
-%%QT5%%%%DATADIR%%/ui5/queuesconf.py
-%%QT5%%%%DATADIR%%/ui5/readonlyradiobutton.py
-%%QT5%%%%DATADIR%%/ui5/sendfaxdialog.py
-%%QT5%%%%DATADIR%%/ui5/sendfaxdialog_base.py
-%%QT5%%%%DATADIR%%/ui5/settingsdialog.py
-%%QT5%%%%DATADIR%%/ui5/settingsdialog_base.py
-%%QT5%%%%DATADIR%%/ui5/setupdialog.py
-%%QT5%%%%DATADIR%%/ui5/setupdialog_base.py
-%%QT5%%%%DATADIR%%/ui5/setupdialog_base5.py
-%%QT5%%%%DATADIR%%/ui5/systemtray.py
-%%QT5%%%%DATADIR%%/ui5/systrayframe.py
-%%QT5%%%%DATADIR%%/ui5/systrayframe_base.py
-%%QT5%%%%DATADIR%%/ui5/ui_utils.py
-%%QT5%%%%DATADIR%%/ui5/upgradedialog.py
-%%QT5%%%%DATADIR%%/ui5/upgradedialog_base.py
-%%QT5%%%%DATADIR%%/ui5/wifisetupdialog.py
-%%QT5%%%%DATADIR%%/ui5/wifisetupdialog_base.py
+%%X11%%%%QT4%%%%DATADIR%%/ui4/__init__.py
+%%X11%%%%QT4%%%%DATADIR%%/ui4/aboutdialog.py
+%%X11%%%%QT4%%%%DATADIR%%/ui4/aboutdialog_base.py
+%%X11%%%%QT4%%%%DATADIR%%/ui4/aligndialog.py
+%%X11%%%%QT4%%%%DATADIR%%/ui4/aligndialog_base.py
+%%X11%%%%QT4%%%%DATADIR%%/ui4/cleandialog.py
+%%X11%%%%QT4%%%%DATADIR%%/ui4/cleandialog_base.py
+%%X11%%%%QT4%%%%DATADIR%%/ui4/colorcaldialog.py
+%%X11%%%%QT4%%%%DATADIR%%/ui4/colorcaldialog_base.py
+%%X11%%%%QT4%%%%DATADIR%%/ui4/devicesetupdialog.py
+%%X11%%%%QT4%%%%DATADIR%%/ui4/devicesetupdialog_base.py
+%%X11%%%%QT4%%%%DATADIR%%/ui4/deviceuricombobox.py
+%%X11%%%%QT4%%%%DATADIR%%/ui4/devmgr5.py
+%%X11%%%%QT4%%%%DATADIR%%/ui4/devmgr5_base.py
+%%X11%%%%QT4%%%%DATADIR%%/ui4/fabgrouptable.py
+%%X11%%%%QT4%%%%DATADIR%%/ui4/fabnametable.py
+%%X11%%%%QT4%%%%DATADIR%%/ui4/fabwindow.py
+%%X11%%%%QT4%%%%DATADIR%%/ui4/fabwindow_base.py
+%%X11%%%%QT4%%%%DATADIR%%/ui4/faxsetupdialog.py
+%%X11%%%%QT4%%%%DATADIR%%/ui4/faxsetupdialog_base.py
+%%X11%%%%QT4%%%%DATADIR%%/ui4/filetable.py
+%%X11%%%%QT4%%%%DATADIR%%/ui4/firmwaredialog.py
+%%X11%%%%QT4%%%%DATADIR%%/ui4/firmwaredialog_base.py
+%%X11%%%%QT4%%%%DATADIR%%/ui4/infodialog.py
+%%X11%%%%QT4%%%%DATADIR%%/ui4/infodialog_base.py
+%%X11%%%%QT4%%%%DATADIR%%/ui4/linefeedcaldialog.py
+%%X11%%%%QT4%%%%DATADIR%%/ui4/linefeedcaldialog_base.py
+%%X11%%%%QT4%%%%DATADIR%%/ui4/loadpapergroupbox.py
+%%X11%%%%QT4%%%%DATADIR%%/ui4/makecopiesdialog.py
+%%X11%%%%QT4%%%%DATADIR%%/ui4/makecopiesdialog_base.py
+%%X11%%%%QT4%%%%DATADIR%%/ui4/mimetypesdialog.py
+%%X11%%%%QT4%%%%DATADIR%%/ui4/mimetypesdialog_base.py
+%%X11%%%%QT4%%%%DATADIR%%/ui4/nodevicesdialog.py
+%%X11%%%%QT4%%%%DATADIR%%/ui4/nodevicesdialog_base.py
+%%X11%%%%QT4%%%%DATADIR%%/ui4/plugindiagnose.py
+%%X11%%%%QT4%%%%DATADIR%%/ui4/plugindiagnose_base.py
+%%X11%%%%QT4%%%%DATADIR%%/ui4/plugindialog.py
+%%X11%%%%QT4%%%%DATADIR%%/ui4/plugindialog_base.py
+%%X11%%%%QT4%%%%DATADIR%%/ui4/pluginlicensedialog.py
+%%X11%%%%QT4%%%%DATADIR%%/ui4/pluginlicensedialog_base.py
+%%X11%%%%QT4%%%%DATADIR%%/ui4/pqdiagdialog.py
+%%X11%%%%QT4%%%%DATADIR%%/ui4/pqdiagdialog_base.py
+%%X11%%%%QT4%%%%DATADIR%%/ui4/printdialog.py
+%%X11%%%%QT4%%%%DATADIR%%/ui4/printdialog_base.py
+%%X11%%%%QT4%%%%DATADIR%%/ui4/printernamecombobox.py
+%%X11%%%%QT4%%%%DATADIR%%/ui4/printsettingsdialog.py
+%%X11%%%%QT4%%%%DATADIR%%/ui4/printsettingsdialog_base.py
+%%X11%%%%QT4%%%%DATADIR%%/ui4/printsettingstoolbox.py
+%%X11%%%%QT4%%%%DATADIR%%/ui4/printtestpagedialog.py
+%%X11%%%%QT4%%%%DATADIR%%/ui4/printtestpagedialog_base.py
+%%X11%%%%QT4%%%%DATADIR%%/ui4/queuesconf.py
+%%X11%%%%QT4%%%%DATADIR%%/ui4/readonlyradiobutton.py
+%%X11%%%%QT4%%%%DATADIR%%/ui4/sendfaxdialog.py
+%%X11%%%%QT4%%%%DATADIR%%/ui4/sendfaxdialog_base.py
+%%X11%%%%QT4%%%%DATADIR%%/ui4/settingsdialog.py
+%%X11%%%%QT4%%%%DATADIR%%/ui4/settingsdialog_base.py
+%%X11%%%%QT4%%%%DATADIR%%/ui4/setupdialog.py
+%%X11%%%%QT4%%%%DATADIR%%/ui4/setupdialog_base.py
+%%X11%%%%QT4%%%%DATADIR%%/ui4/systemtray.py
+%%X11%%%%QT4%%%%DATADIR%%/ui4/systrayframe.py
+%%X11%%%%QT4%%%%DATADIR%%/ui4/systrayframe_base.py
+%%X11%%%%QT4%%%%DATADIR%%/ui4/ui_utils.py
+%%X11%%%%QT4%%%%DATADIR%%/ui4/upgradedialog.py
+%%X11%%%%QT4%%%%DATADIR%%/ui4/upgradedialog_base.py
+%%X11%%%%QT4%%%%DATADIR%%/ui4/wifisetupdialog.py
+%%X11%%%%QT4%%%%DATADIR%%/ui4/wifisetupdialog_base.py
+%%X11%%%%QT5%%%%DATADIR%%/ui5/__init__.py
+%%X11%%%%QT5%%%%DATADIR%%/ui5/aboutdialog.py
+%%X11%%%%QT5%%%%DATADIR%%/ui5/aboutdialog_base.py
+%%X11%%%%QT5%%%%DATADIR%%/ui5/aligndialog.py
+%%X11%%%%QT5%%%%DATADIR%%/ui5/aligndialog_base.py
+%%X11%%%%QT5%%%%DATADIR%%/ui5/cleandialog.py
+%%X11%%%%QT5%%%%DATADIR%%/ui5/cleandialog_base.py
+%%X11%%%%QT5%%%%DATADIR%%/ui5/colorcaldialog.py
+%%X11%%%%QT5%%%%DATADIR%%/ui5/colorcaldialog_base.py
+%%X11%%%%QT5%%%%DATADIR%%/ui5/devicesetupdialog.py
+%%X11%%%%QT5%%%%DATADIR%%/ui5/devicesetupdialog_base.py
+%%X11%%%%QT5%%%%DATADIR%%/ui5/deviceuricombobox.py
+%%X11%%%%QT5%%%%DATADIR%%/ui5/devmgr5.py
+%%X11%%%%QT5%%%%DATADIR%%/ui5/devmgr5_base.py
+%%X11%%%%QT5%%%%DATADIR%%/ui5/devmgr_ext.py
+%%X11%%%%QT5%%%%DATADIR%%/ui5/fabgrouptable.py
+%%X11%%%%QT5%%%%DATADIR%%/ui5/fabnametable.py
+%%X11%%%%QT5%%%%DATADIR%%/ui5/fabwindow.py
+%%X11%%%%QT5%%%%DATADIR%%/ui5/fabwindow_base.py
+%%X11%%%%QT5%%%%DATADIR%%/ui5/faxsetupdialog.py
+%%X11%%%%QT5%%%%DATADIR%%/ui5/faxsetupdialog_base.py
+%%X11%%%%QT5%%%%DATADIR%%/ui5/filetable.py
+%%X11%%%%QT5%%%%DATADIR%%/ui5/firmwaredialog.py
+%%X11%%%%QT5%%%%DATADIR%%/ui5/firmwaredialog_base.py
+%%X11%%%%QT5%%%%DATADIR%%/ui5/infodialog.py
+%%X11%%%%QT5%%%%DATADIR%%/ui5/infodialog_base.py
+%%X11%%%%QT5%%%%DATADIR%%/ui5/linefeedcaldialog.py
+%%X11%%%%QT5%%%%DATADIR%%/ui5/linefeedcaldialog_base.py
+%%X11%%%%QT5%%%%DATADIR%%/ui5/loadpapergroupbox.py
+%%X11%%%%QT5%%%%DATADIR%%/ui5/makecopiesdialog.py
+%%X11%%%%QT5%%%%DATADIR%%/ui5/makecopiesdialog_base.py
+%%X11%%%%QT5%%%%DATADIR%%/ui5/mimetypesdialog.py
+%%X11%%%%QT5%%%%DATADIR%%/ui5/mimetypesdialog_base.py
+%%X11%%%%QT5%%%%DATADIR%%/ui5/nodevicesdialog.py
+%%X11%%%%QT5%%%%DATADIR%%/ui5/nodevicesdialog_base.py
+%%X11%%%%QT5%%%%DATADIR%%/ui5/plugindiagnose.py
+%%X11%%%%QT5%%%%DATADIR%%/ui5/plugindiagnose_base.py
+%%X11%%%%QT5%%%%DATADIR%%/ui5/plugindialog.py
+%%X11%%%%QT5%%%%DATADIR%%/ui5/plugindialog_base.py
+%%X11%%%%QT5%%%%DATADIR%%/ui5/pluginlicensedialog.py
+%%X11%%%%QT5%%%%DATADIR%%/ui5/pluginlicensedialog_base.py
+%%X11%%%%QT5%%%%DATADIR%%/ui5/pqdiagdialog.py
+%%X11%%%%QT5%%%%DATADIR%%/ui5/pqdiagdialog_base.py
+%%X11%%%%QT5%%%%DATADIR%%/ui5/printdialog.py
+%%X11%%%%QT5%%%%DATADIR%%/ui5/printdialog_base.py
+%%X11%%%%QT5%%%%DATADIR%%/ui5/printernamecombobox.py
+%%X11%%%%QT5%%%%DATADIR%%/ui5/printsettings_base.py
+%%X11%%%%QT5%%%%DATADIR%%/ui5/printsettingsdialog.py
+%%X11%%%%QT5%%%%DATADIR%%/ui5/printsettingsdialog_base.py
+%%X11%%%%QT5%%%%DATADIR%%/ui5/printsettingstoolbox.py
+%%X11%%%%QT5%%%%DATADIR%%/ui5/printtestpagedialog.py
+%%X11%%%%QT5%%%%DATADIR%%/ui5/printtestpagedialog_base.py
+%%X11%%%%QT5%%%%DATADIR%%/ui5/queuesconf.py
+%%X11%%%%QT5%%%%DATADIR%%/ui5/readonlyradiobutton.py
+%%X11%%%%QT5%%%%DATADIR%%/ui5/sendfaxdialog.py
+%%X11%%%%QT5%%%%DATADIR%%/ui5/sendfaxdialog_base.py
+%%X11%%%%QT5%%%%DATADIR%%/ui5/settingsdialog.py
+%%X11%%%%QT5%%%%DATADIR%%/ui5/settingsdialog_base.py
+%%X11%%%%QT5%%%%DATADIR%%/ui5/setupdialog.py
+%%X11%%%%QT5%%%%DATADIR%%/ui5/setupdialog_base.py
+%%X11%%%%QT5%%%%DATADIR%%/ui5/setupdialog_base5.py
+%%X11%%%%QT5%%%%DATADIR%%/ui5/systemtray.py
+%%X11%%%%QT5%%%%DATADIR%%/ui5/systrayframe.py
+%%X11%%%%QT5%%%%DATADIR%%/ui5/systrayframe_base.py
+%%X11%%%%QT5%%%%DATADIR%%/ui5/ui_utils.py
+%%X11%%%%QT5%%%%DATADIR%%/ui5/upgradedialog.py
+%%X11%%%%QT5%%%%DATADIR%%/ui5/upgradedialog_base.py
+%%X11%%%%QT5%%%%DATADIR%%/ui5/wifisetupdialog.py
+%%X11%%%%QT5%%%%DATADIR%%/ui5/wifisetupdialog_base.py
 %%DATADIR%%/uninstall.py
 %%DATADIR%%/unload.py
 %%DATADIR%%/upgrade.py
@@ -1819,7 +1819,7 @@ share/ppd/HP/hp-psc_950xi.ppd.gz
 @dir %%DATADIR%%/data/images/64x64
 @dir %%DATADIR%%/data/images/devices
 @dir %%DATADIR%%/data/images/other
-%%QT4%%@dir %%DATADIR%%/ui4/plugins
-%%QT5%%@dir %%DATADIR%%/ui5/plugins
+%%X11%%%%QT4%%@dir %%DATADIR%%/ui4/plugins
+%%X11%%%%QT5%%@dir %%DATADIR%%/ui5/plugins
 @dir /var/lib/hp
 @dir /var/lib