diff options
| author | Jeff Morriss <jeff.morriss.ws@gmail.com> | 2014-01-02 19:11:06 +0000 |
|---|---|---|
| committer | Jeff Morriss <jeff.morriss.ws@gmail.com> | 2014-01-02 19:11:06 +0000 |
| commit | a56494a526e6c362c22b1169fa42ca150e78a672 (patch) | |
| tree | a5d9260ee3f6c8a838b1cb7fa74b031f7b04cc26 /ui | |
| parent | bbcd2dcc12e4f4614be252d3df3d989067b7e472 (diff) | |
| download | wireshark-a56494a526e6c362c22b1169fa42ca150e78a672.tar.gz | |
Fix wireshark-qt startup coredump under autofoo and Windows: make cmake's
VERSION_* macros integers instead of numbers (and treat them as such in
ui/qt/about_dialog.cpp).
svn path=/trunk/; revision=54563
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/qt/about_dialog.cpp | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/ui/qt/about_dialog.cpp b/ui/qt/about_dialog.cpp index 1810be255a..51aebdfff5 100644 --- a/ui/qt/about_dialog.cpp +++ b/ui/qt/about_dialog.cpp @@ -105,7 +105,6 @@ AboutDialog::AboutDialog(QWidget *parent) : char *path = NULL; const char *constpath; gchar *message; - const char *version; #if defined (HAVE_LIBSMI) || defined (HAVE_GEOIP) gint i; gchar **resultArray; @@ -144,14 +143,9 @@ AboutDialog::AboutDialog(QWidget *parent) : ui->label_wireshark->setTextInteractionFlags(Qt::TextSelectableByMouse); ui->label_wireshark->setText(message); - /* VERSION_MINOR is const char * with CMake and int with Autofoo.... */ - version = (const char *)VERSION_MINOR; - - /* Check if Dev release... (VERSION_MINOR is odd) */ - if ( atoi(version) % 2 == 1) - { +#if VERSION_MINOR & 1 ui->label_logo->setPixmap( QPixmap( ":/about/wssplash_dev.png" ) ); - } +#endif /* Authors */ |