diff options
| author | Guy Harris <guy@alum.mit.edu> | 2014-06-21 18:02:27 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2014-06-22 01:06:25 +0000 |
| commit | c46329c27b8c31729d2d51dc4f69da9b3923de04 (patch) | |
| tree | 196522550c36225b4248bc8c6ed2fb86d5b0ddab /ui/qt/about_dialog.cpp | |
| parent | a70dea195625f32a026d10d937345d177f81aead (diff) | |
| download | wireshark-c46329c27b8c31729d2d51dc4f69da9b3923de04.tar.gz | |
Add a routine to return a version string including VCS information.
Add a routine get_ws_vcs_version_info() that, for builds from a tree
checked out from Wireshark's version control system, returns a string
that includes both the Wireshark version number and an indication of
what particular VCS version was checked out, and just returns
Wireshark's version number for other builds.
Use that routine rather than manually gluing VERSION and the Git version
number together.
("vcs", not "git", just in case we do something bizarre or mercurial
some day. :-))
Change-Id: Ie5c6dc83b9d3f56655eaef30fec3ec9916b6320d
Reviewed-on: https://code.wireshark.org/review/2529
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'ui/qt/about_dialog.cpp')
| -rw-r--r-- | ui/qt/about_dialog.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ui/qt/about_dialog.cpp b/ui/qt/about_dialog.cpp index c0c3fb610c..231645ee4f 100644 --- a/ui/qt/about_dialog.cpp +++ b/ui/qt/about_dialog.cpp @@ -38,7 +38,6 @@ #endif #include "../log.h" -#include "../version_info.h" #include "../register.h" #include "ui/text_import_scanner.h" @@ -51,6 +50,7 @@ #include "wsutil/tempfile.h" #include "wsutil/plugins.h" #include "wsutil/copyright_info.h" +#include "wsutil/ws_version_info.h" #include "qt_ui_utils.h" @@ -136,7 +136,7 @@ AboutDialog::AboutDialog(QWidget *parent) : /* Construct the message string */ message = QString( - "Version " VERSION "%1\n" + "Version %1\n" "\n" "%2" "\n" @@ -147,7 +147,7 @@ AboutDialog::AboutDialog(QWidget *parent) : "Wireshark is Open Source Software released under the GNU General Public License.\n" "\n" "Check the man page and http://www.wireshark.org for more information.") - .arg(wireshark_gitversion).arg(get_copyright_info()).arg(comp_info_str->str) + .arg(get_ws_vcs_version_info()).arg(get_copyright_info()).arg(comp_info_str->str) .arg(runtime_info_str->str); ui->label_wireshark->setTextInteractionFlags(Qt::TextSelectableByMouse); |