diff options
| -rw-r--r-- | cmakeconfig.h.in | 6 | ||||
| -rw-r--r-- | ui/qt/about_dialog.cpp | 10 |
2 files changed, 5 insertions, 11 deletions
diff --git a/cmakeconfig.h.in b/cmakeconfig.h.in index 81fcd6c4b1..d958f0791a 100644 --- a/cmakeconfig.h.in +++ b/cmakeconfig.h.in @@ -7,9 +7,9 @@ /* Version number of package */ #define VERSION "${CPACK_PACKAGE_VERSION}" -#define VERSION_MAJOR "${PROJECT_MAJOR_VERSION}" -#define VERSION_MINOR "${PROJECT_MINOR_VERSION}" -#define VERSION_MICRO "${PROJECT_PATCH_VERSION}" +#define VERSION_MAJOR ${PROJECT_MAJOR_VERSION} +#define VERSION_MINOR ${PROJECT_MINOR_VERSION} +#define VERSION_MICRO ${PROJECT_PATCH_VERSION} /* FIXME: Move the path stuff to the CMakeInstallDirs.cmake file */ /* Directory for data */ 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 */ |