mirror of
https://github.com/xiaoyifang/goldendict-ng.git
synced 2024-11-27 15:24:05 +00:00
opt: print _MSC_FULL_VER instead of incorrect VS version
the _MSC_FULL_VER and VS version has no direct and sound connection.
This commit is contained in:
parent
6bc1e0d219
commit
96347bef7f
6
about.cc
6
about.cc
|
@ -23,10 +23,8 @@ About::About( QWidget * parent ): QDialog( parent )
|
||||||
ui.version->setText( version );
|
ui.version->setText( version );
|
||||||
|
|
||||||
#if defined (_MSC_VER)
|
#if defined (_MSC_VER)
|
||||||
QString compilerVersion = QString( "Visual C++ %1.%2.%3" )
|
QString compilerVersion = QString( "Visual C++ Compiler: %1" )
|
||||||
.arg( GD_CXX_MSVC_MAJOR )
|
.arg( _MSC_FULL_VER );
|
||||||
.arg( GD_CXX_MSVC_MINOR )
|
|
||||||
.arg( GD_CXX_MSVC_BUILD );
|
|
||||||
#elif defined (__clang__) && defined (__clang_version__)
|
#elif defined (__clang__) && defined (__clang_version__)
|
||||||
QString compilerVersion = QLatin1String( "Clang " ) + QLatin1String( __clang_version__ );
|
QString compilerVersion = QLatin1String( "Clang " ) + QLatin1String( __clang_version__ );
|
||||||
#else
|
#else
|
||||||
|
|
14
about.hh
14
about.hh
|
@ -7,20 +7,6 @@
|
||||||
#include "ui_about.h"
|
#include "ui_about.h"
|
||||||
#include <QDialog>
|
#include <QDialog>
|
||||||
|
|
||||||
// Microsoft Visual C++ version
|
|
||||||
#if defined (_MSC_VER)
|
|
||||||
// how many digits does the build number have?
|
|
||||||
# if _MSC_FULL_VER / 10000 == _MSC_VER
|
|
||||||
# define GD_CXX_MSVC_BUILD (_MSC_FULL_VER % 10000) // four digits
|
|
||||||
# elif _MSC_FULL_VER / 100000 == _MSC_VER
|
|
||||||
# define GD_CXX_MSVC_BUILD (_MSC_FULL_VER % 100000) // five digits
|
|
||||||
# else
|
|
||||||
# define GD_CXX_MSVC_BUILD 0
|
|
||||||
# endif
|
|
||||||
# define GD_CXX_MSVC_MAJOR (_MSC_VER/100-6)
|
|
||||||
# define GD_CXX_MSVC_MINOR (_MSC_VER%100)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
class About: public QDialog
|
class About: public QDialog
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
|
|
Loading…
Reference in a new issue