Merge pull request #261 from olive-editor/commitmsg
added commit hash to titlebar
This commit is contained in:
+8
-1
@@ -55,7 +55,7 @@ MainWindow* mainWindow;
|
||||
|
||||
QTimer autorecovery_timer;
|
||||
QString config_fn;
|
||||
QString appName = "Olive (January 2019 | Alpha)";
|
||||
QString appName;
|
||||
bool demoNoticeShown = false;
|
||||
|
||||
void MainWindow::setup_layout(bool reset) {
|
||||
@@ -94,6 +94,13 @@ void MainWindow::setup_layout(bool reset) {
|
||||
MainWindow::MainWindow(QWidget *parent) :
|
||||
QMainWindow(parent)
|
||||
{
|
||||
appName = "Olive (January 2019 | Alpha";
|
||||
#ifdef GITHASH
|
||||
appName += " | ";
|
||||
appName += GITHASH;
|
||||
#endif
|
||||
appName += ")";
|
||||
|
||||
enable_launch_with_project = false;
|
||||
|
||||
setup_debug();
|
||||
|
||||
@@ -27,6 +27,11 @@ DEFINES += QT_DEPRECATED_WARNINGS
|
||||
# You can also select to disable deprecated APIs only up to a certain version of Qt.
|
||||
#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0
|
||||
|
||||
# Tries to get the current Git short hash
|
||||
system("which git") {
|
||||
GITHASHVAR = $$system(git --git-dir $$PWD/.git --work-tree $$PWD log -1 --format=%h)
|
||||
DEFINES += GITHASH=\\"\"$$GITHASHVAR\\"\"
|
||||
}
|
||||
|
||||
SOURCES += \
|
||||
main.cpp \
|
||||
|
||||
Reference in New Issue
Block a user