Miroirs/leocad
1
0
Fork 0
mirror of https://github.com/leozide/leocad synced 2024-11-17 07:47:55 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Use short hash for continuous version.

Browse source
This commit is contained in:
Leonardo Zide 2019-03-17 12:21:33 -07:00
parent 7c267c91d3
commit c68ce5fff8
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
leocad.pro
View file

@ -61,12 +61,12 @@ isEmpty(QMAKE_LRELEASE) {
TRAVIS_COMMIT = $$(TRAVIS_COMMIT)
!isEmpty(TRAVIS_COMMIT) {
DEFINES += "LC_CONTINUOUS_BUILD=$$TRAVIS_COMMIT"
DEFINES += "LC_CONTINUOUS_BUILD=$$system(git rev-parse --short HEAD)"
}
APPVEYOR_REPO_COMMIT = $$(APPVEYOR_REPO_COMMIT)
!isEmpty(APPVEYOR_REPO_COMMIT) {
DEFINES += "LC_CONTINUOUS_BUILD=$$APPVEYOR_REPO_COMMIT"
DEFINES += "LC_CONTINUOUS_BUILD=$$system(git rev-parse --short HEAD)"
}
TSFILES = resources/leocad_fr.ts resources/leocad_pt.ts resources/leocad_de.ts

2
qt/lc_qaboutdialog.cpp
View file

@ -12,7 +12,7 @@ lcQAboutDialog::lcQAboutDialog(QWidget *parent) :
ui->setupUi(this);
#ifdef LC_CONTINUOUS_BUILD
ui->version->setText(tr("LeoCAD Continuous Build\nfrom commit %1").arg(QString::fromLatin1(LC_CONTINUOUS_BUILD)));
ui->version->setText(tr("LeoCAD Continuous Build\nfrom commit %1").arg(QString::fromLatin1(QT_STRINGIFY(LC_CONTINUOUS_BUILD))));
#else
ui->version->setText(tr("LeoCAD Version %1").arg(QString::fromLatin1(LC_VERSION_TEXT)));
#endif