diff options
Diffstat (limited to 'packaging/wix')
| -rw-r--r-- | packaging/wix/windeployqt-to-wix.ps1 | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/packaging/wix/windeployqt-to-wix.ps1 b/packaging/wix/windeployqt-to-wix.ps1 index b621e55e63..70623a2b3d 100644 --- a/packaging/wix/windeployqt-to-wix.ps1 +++ b/packaging/wix/windeployqt-to-wix.ps1 @@ -179,28 +179,6 @@ try { </Fragment> "@ - } else { - # Assume Qt 4 - - $wixComponents += @" - <Fragment> - <DirectoryRef Id=`"INSTALLFOLDER`"> - <Component Id=`"cmpQt4Core_dll`" Guid=`"*`"> - <File Id=`"filQt4Core_dll`" KeyPath=`"yes`" Source=`"`$(var.WiresharkQt.Dir)\QtCore4.dll`" /> - </Component> - <Component Id=`"cmpQt4Gui_dll`" Guid=`"*`"> - <File Id=`"filQt4Gui_dll`" KeyPath=`"yes`" Source=`"`$(var.WiresharkQt.Dir)\QtGui4.dll`" /> - </Component> - </DirectoryRef> - </Fragment> - <Fragment> - <ComponentGroup Id=`"CG.QtDependencies`"> - <ComponentRef Id=`"cmpQt4Core_dll`" /> - <ComponentRef Id=`"cmpQt4Gui_dll`" /> - </ComponentGroup> - </Fragment> -"@ - } $wixComponents += @" |