diff options
-rw-r--r-- | CMakeLists.txt | 2 | ||||
-rw-r--r-- | packaging/nsis/logray.nsi | 2 | ||||
-rw-r--r-- | packaging/nsis/uninstall-logray.nsi | 2 | ||||
-rw-r--r-- | packaging/nsis/uninstall-wireshark.nsi | 2 | ||||
-rw-r--r-- | packaging/nsis/wireshark.nsi | 2 | ||||
-rw-r--r-- | packaging/wix/ComponentGroups.wxi | 3 | ||||
-rw-r--r-- | resources/Acknowledgements.md (renamed from Acknowledgements.md) | 0 | ||||
-rw-r--r-- | resources/about.qrc | 2 | ||||
-rw-r--r-- | resources/gpl-2.0-standalone.html (renamed from gpl-2.0-standalone.html) | 0 | ||||
-rw-r--r-- | ui/qt/about_dialog.cpp | 4 |
10 files changed, 4 insertions, 15 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 94147446b3..13cb892b71 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1926,9 +1926,7 @@ set(INSTALL_DIRS # Installed into ${DATAFILE_DIR} set(INSTALL_FILES - Acknowledgements.md enterprises.tsv - gpl-2.0-standalone.html manuf resources/share/wireshark/cfilters resources/share/wireshark/colorfilters diff --git a/packaging/nsis/logray.nsi b/packaging/nsis/logray.nsi index 7c1528dfcc..e923fa0269 100644 --- a/packaging/nsis/logray.nsi +++ b/packaging/nsis/logray.nsi @@ -467,8 +467,6 @@ File "${STAGING_DIR}\dumpcap.exe" File "${STAGING_DIR}\dumpcap.html" File "${STAGING_DIR}\extcap.html" File "${STAGING_DIR}\ipmap.html" -File "${STAGING_DIR}\gpl-2.0-standalone.html" -File "${STAGING_DIR}\Acknowledgements.md" ; C-runtime redistributable ; vc_redist.x64.exe or vc_redist.x86.exe - copy and execute the redistributable installer diff --git a/packaging/nsis/uninstall-logray.nsi b/packaging/nsis/uninstall-logray.nsi index a17c546400..6f392bd211 100644 --- a/packaging/nsis/uninstall-logray.nsi +++ b/packaging/nsis/uninstall-logray.nsi @@ -148,8 +148,6 @@ Delete "$INSTDIR\COPYING*" Delete "$INSTDIR\audio\*.*" Delete "$INSTDIR\bearer\*.*" Delete "$INSTDIR\diameter\*.*" -Delete "$INSTDIR\gpl-2.0-standalone.html" -Delete "$INSTDIR\Acknowledgements.md" Delete "$INSTDIR\help\*.*" Delete "$INSTDIR\iconengines\*.*" Delete "$INSTDIR\imageformats\*.*" diff --git a/packaging/nsis/uninstall-wireshark.nsi b/packaging/nsis/uninstall-wireshark.nsi index 3a2ae19b5e..1f0a5252ae 100644 --- a/packaging/nsis/uninstall-wireshark.nsi +++ b/packaging/nsis/uninstall-wireshark.nsi @@ -185,8 +185,6 @@ Delete "$INSTDIR\extcap\randpktdump.*" Delete "$INSTDIR\extcap\sshdump.*" Delete "$INSTDIR\extcap\udpdump.*" Delete "$INSTDIR\extcap\wifidump.*" -Delete "$INSTDIR\gpl-2.0-standalone.html" -Delete "$INSTDIR\Acknowledgements.md" Delete "$INSTDIR\help\*.*" Delete "$INSTDIR\iconengines\*.*" Delete "$INSTDIR\imageformats\*.*" diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi index 53fbf96e05..7c06c51168 100644 --- a/packaging/nsis/wireshark.nsi +++ b/packaging/nsis/wireshark.nsi @@ -521,8 +521,6 @@ File "${STAGING_DIR}\dumpcap.exe" File "${STAGING_DIR}\dumpcap.html" File "${STAGING_DIR}\extcap.html" File "${STAGING_DIR}\ipmap.html" -File "${STAGING_DIR}\gpl-2.0-standalone.html" -File "${STAGING_DIR}\Acknowledgements.md" ; C-runtime redistributable ; vc_redist.x64.exe or vc_redist.x86.exe - copy and execute the redistributable installer diff --git a/packaging/wix/ComponentGroups.wxi b/packaging/wix/ComponentGroups.wxi index 9109cce2c4..fd25ab0d23 100644 --- a/packaging/wix/ComponentGroups.wxi +++ b/packaging/wix/ComponentGroups.wxi @@ -42,9 +42,6 @@ <Component Id="cmpAUTHORS_SHORT" Guid="*"> <File Id="filAUTHORS_SHORT" KeyPath="yes" Source="$(var.Staging.Dir)\AUTHORS-SHORT" /> </Component> - <Component Id="cmpGpl2_Standalone_html" Guid="*"> - <File Id="filGpl2_Standalone_html" KeyPath="yes" Source="$(var.Staging.Dir)\gpl-2.0-standalone.html" /> - </Component> <Component Id="cmpManuf" Guid="*"> <File Id="filManuf" KeyPath="yes" Source="$(var.Staging.Dir)\manuf" /> </Component> diff --git a/Acknowledgements.md b/resources/Acknowledgements.md index 0942a8bfa1..0942a8bfa1 100644 --- a/Acknowledgements.md +++ b/resources/Acknowledgements.md diff --git a/resources/about.qrc b/resources/about.qrc index 86ce08e198..a0c9fb4095 100644 --- a/resources/about.qrc +++ b/resources/about.qrc @@ -1,5 +1,7 @@ <RCC> <qresource prefix="/about"> + <file>Acknowledgements.md</file> + <file>gpl-2.0-standalone.html</file> <file>wssplash.png</file> <file>wssplash_dev.png</file> </qresource> diff --git a/gpl-2.0-standalone.html b/resources/gpl-2.0-standalone.html index afa0ad711c..afa0ad711c 100644 --- a/gpl-2.0-standalone.html +++ b/resources/gpl-2.0-standalone.html diff --git a/ui/qt/about_dialog.cpp b/ui/qt/about_dialog.cpp index 752b669ac4..6d2b2b7ef9 100644 --- a/ui/qt/about_dialog.cpp +++ b/ui/qt/about_dialog.cpp @@ -358,7 +358,7 @@ AboutDialog::AboutDialog(QWidget *parent) : connect(ui->searchShortcuts, &QLineEdit::textChanged, shortcutProxyModel, &AStringListListSortFilterProxyModel::setFilter); /* Acknowledgements */ - f_acknowledgements.setFileName(get_datafile_path("Acknowledgements.md")); + f_acknowledgements.setFileName(":/about/Acknowledgements.md"); f_acknowledgements.open(QFile::ReadOnly | QFile::Text); QTextStream ReadFile_acks(&f_acknowledgements); @@ -380,7 +380,7 @@ AboutDialog::AboutDialog(QWidget *parent) : #endif /* License */ - f_license.setFileName(get_datafile_path("gpl-2.0-standalone.html")); + f_license.setFileName(":/about/gpl-2.0-standalone.html"); f_license.open(QFile::ReadOnly | QFile::Text); QTextStream ReadFile_license(&f_license); |