Skip to content
Permalink
Browse files

fixed version information.(refs #62)

  • Loading branch information...
haraki committed Jun 27, 2019
1 parent eff172c commit a889fc8fd683f3c58f454228a73f559f7746a617
Showing with 12 additions and 7 deletions.
  1. +4 −4 mainwindow.cpp
  2. +1 −1 win32.cpp
  3. +7 −2 xnix.cpp
@@ -867,10 +867,10 @@ void MainWindow::about()
{
QMessageBox::about(this,
tr("About %1").arg(qApp->applicationName()),
QString("<p><font size = '+4'>%1<font size = '+1'> Version %2</font></font></p>").arg(qApp->applicationName()).arg(qApp->applicationVersion())
+ QString("<p style = 'font-weight:normal'>Based on Qt %1 ").arg(qVersion())
+ QString("(%1)").arg(getCompilerVersion())
+ QString("<p style = 'font-weight:normal'>Copyright 2019 %1 All right reserved.</p>").arg(qApp->organizationName())
tr("<p><font size = '+4'>%1<font size = '+1'> Version %2</font></font></p>").arg(qApp->applicationName()).arg(qApp->applicationVersion())
+ tr("<p style = 'font-weight:normal'>Based on Qt %1 ").arg(qVersion())
+ tr("(%1)").arg(getCompilerVersion())
+ tr("<p style = 'font-weight:normal'>Copyright 2019 %1 All right reserved.</p>").arg(qApp->organizationName())
);
}

@@ -103,7 +103,7 @@ QString getCompilerVersion()
#elif defined(__MINGW32__)
return QString("MinGW %1.%2, 32bit").arg(__MINGW32_MAJOR_VERSION).arg(__MINGW32_MINOR_VERSION)
#else
return QString("unknown")
return QString("")
#endif
;
}
@@ -32,9 +32,14 @@ extern QString getCompilerVersion()
#if defined(__clang__)
return QString("Clang %1").arg(__clang_version__)
#elif defined(__GNUC__)
return QString("gcc %1.%2.%3").arg(__GNUC__).arg(__GNUC_MINOR__).arg(__GNUC_PATCHLEVEL__)
return QString("gcc %1, %2").arg(__VERSION__)
# if defined(__x86_64__)
.arg("64bit")
# else
.arg("32bit")
# endif
#else
return QString("unknown")
return QString("")
#endif
;
}

0 comments on commit a889fc8

Please sign in to comment.
You can’t perform that action at this time.