diff options
| author | Gerald Combs <gerald@wireshark.org> | 2018-04-05 18:00:16 -0700 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2018-04-06 03:11:52 +0000 |
| commit | 0cb3176ab770c6a5f69ffc5a5cd8889a3d5b23a0 (patch) | |
| tree | ae4b2e16b94120dedf7170fb2dd7cd4e8a69ed7a /packaging | |
| parent | 5fd4659164536a494480b4717e6f6b5ae530c119 (diff) | |
Remove some references to Qt4.
Change-Id: I50f5abafb8adf18a5407427f7feb260301df45cc
Reviewed-on: https://code.wireshark.org/review/26771
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/nsis/windeployqt-to-nsis.ps1 | 10 | ||||
| -rw-r--r-- | packaging/wix/windeployqt-to-wix.ps1 | 22 |
2 files changed, 1 insertions, 31 deletions
diff --git a/packaging/nsis/windeployqt-to-nsis.ps1 b/packaging/nsis/windeployqt-to-nsis.ps1 index 8fed6baff0..a28139ba48 100644 --- a/packaging/nsis/windeployqt-to-nsis.ps1 +++ b/packaging/nsis/windeployqt-to-nsis.ps1 @@ -100,14 +100,6 @@ File "..\..\wireshark-qt-release\Qt5PrintSupport.dll" File /r "..\..\wireshark-qt-release\platforms" "@ - } else { - # Assume Qt 4 - - $nsisCommands += @" -File "..\..\wireshark-qt-release\QtCore4.dll" -File "..\..\wireshark-qt-release\QtGui4.dll" -"@ - } } @@ -126,4 +118,4 @@ Set-Content $FilePath @" # "@ -Add-Content $FilePath $nsisCommands
\ No newline at end of file +Add-Content $FilePath $nsisCommands 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 += @" |