forked from osmocom/wireshark
GUI: Ship license + acknowledgements as Qt resource
This commit is contained in:
parent
0a840b5dd8
commit
2ab291b3b2
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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\*.*"
|
||||
|
|
|
@ -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\*.*"
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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);
|
||||
|
|
Loading…
Reference in New Issue