v0.3.0 #1

Merged
mojitaurelie merged 4 commits from dev_0.3 into main 2023-02-21 18:29:54 +01:00
Showing only changes of commit 93026b1373 - Show all commits

View File

@@ -10,7 +10,11 @@ AboutDialog::AboutDialog(QWidget *parent) :
ui(new Ui::AboutDialog) ui(new Ui::AboutDialog)
{ {
ui->setupUi(this); ui->setupUi(this);
#ifdef APP_ARCH
ui->appName->setText(QString("%1 (%2)").arg(APP_NAME, APP_ARCH)); ui->appName->setText(QString("%1 (%2)").arg(APP_NAME, APP_ARCH));
#else
ui->appName->setText(APP_NAME);
#endif
QString compiler = getCompilerInfo(); QString compiler = getCompilerInfo();
ui->version->setText(QString("v%1-%3 (qt %4)").arg(APP_VERSION, compiler, QT_VERSION_STR)); ui->version->setText(QString("v%1-%3 (qt %4)").arg(APP_VERSION, compiler, QT_VERSION_STR));
ui->textEdit_2->append(QString("Qt Open Source %1").arg(QT_VERSION_STR)); ui->textEdit_2->append(QString("Qt Open Source %1").arg(QT_VERSION_STR));
@@ -23,14 +27,17 @@ AboutDialog::~AboutDialog()
QString AboutDialog::getCompilerInfo() QString AboutDialog::getCompilerInfo()
{ {
#ifdef __GNUC__ #ifdef __APPLE__
return QString("clang_%1").arg(__clang_version__);
#elif __GNUC__
#ifdef __MINGW32__ #ifdef __MINGW32__
return QString("MinGW_%1.%2.%3").arg(__GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__); return QString("MinGW_%1.%2").arg(QString::number(__MINGW32_MAJOR_VERSION), QString::number(__MINGW32_MINOR_VERSION));
#else #else
return QString("GLIBC_%1").arg(gnu_get_libc_version()); return QString("GLIBC_%1").arg(gnu_get_libc_version());
#endif #endif
#elif _MSC_VER
return QString("MSVC_%1").arg(_MSC_VER);
#else #else
return "unknown"; return "unknown";
#endif #endif
} }