Fix the launcher's version label for builds with no git commit info

sceneinput
scrawl 10 years ago
parent cbf9f83b85
commit 5602cd9b7b

@ -175,20 +175,16 @@ void Launcher::MainDialog::setVersionLabel()
QString tag(QString::fromUtf8(v.mTagHash.c_str())); QString tag(QString::fromUtf8(v.mTagHash.c_str()));
versionLabel->setTextInteractionFlags(Qt::TextSelectableByMouse); versionLabel->setTextInteractionFlags(Qt::TextSelectableByMouse);
if (!revision.isEmpty() && !tag.isEmpty()) if (!v.mVersion.empty() && (revision.isEmpty() || revision == tag))
{ versionLabel->setText(tr("OpenMW %1 release").arg(QString::fromUtf8(v.mVersion.c_str())));
if (revision == tag) { else
versionLabel->setText(tr("OpenMW %1 release").arg(QString::fromUtf8(v.mVersion.c_str()))); versionLabel->setText(tr("OpenMW development (%1)").arg(revision.left(10)));
} else {
versionLabel->setText(tr("OpenMW development (%1)").arg(revision.left(10))); // Add the compile date and time
} versionLabel->setToolTip(tr("Compiled on %1 %2").arg(QLocale(QLocale::C).toDate(QString(__DATE__).simplified(),
QLatin1String("MMM d yyyy")).toString(Qt::SystemLocaleLongDate),
// Add the compile date and time QLocale(QLocale::C).toTime(QString(__TIME__).simplified(),
versionLabel->setToolTip(tr("Compiled on %1 %2").arg(QLocale(QLocale::C).toDate(QString(__DATE__).simplified(), QLatin1String("hh:mm:ss")).toString(Qt::SystemLocaleShortDate)));
QLatin1String("MMM d yyyy")).toString(Qt::SystemLocaleLongDate),
QLocale(QLocale::C).toTime(QString(__TIME__).simplified(),
QLatin1String("hh:mm:ss")).toString(Qt::SystemLocaleShortDate)));
}
} }
bool Launcher::MainDialog::setup() bool Launcher::MainDialog::setup()

Loading…
Cancel
Save