Dusk/GitAddonsManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Correct redundant version string

Browse Source
This commit is contained in:
woblight
2018-06-24 00:10:49 +02:00
parent 4c7da1a306
commit aeb4bdb83e
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GitAddonsManager.pro
+2 -4
View File
@@ -40,11 +40,9 @@ win32 {
DEFINES += _WIN32_WINNT=0x06010000 DEFINES += _WIN32_WINNT=0x06010000
} }
GIT_TAG = $$system(git describe --tags) GIT_DESCRIBE = $$system(git describe --tags)
GIT_SHA = $$system(git rev-parse --short HEAD)
DEFINES += GIT_TAG=\\\"$$GIT_TAG\\\" \ DEFINES += GIT_DESCRIBE=\\\"$$GIT_DESCRIBE\\\"
GIT_SHA=\\\"$$GIT_SHA\\\"
DISTFILES += \ DISTFILES += \
README.md README.md
main.cpp
+1 -1
View File
@@ -36,7 +36,7 @@ int main(int argc, char *argv[])
return Control::instance(); return Control::instance();
}); });
qmlRegisterUncreatableType<Addon>("GitAddonsManager.engine",1,0,"Addon",""); qmlRegisterUncreatableType<Addon>("GitAddonsManager.engine",1,0,"Addon","");
engine.rootContext()->setContextProperty("gitVersion", QString("%1 (%2)").arg(GIT_TAG, GIT_SHA)); engine.rootContext()->setContextProperty("gitVersion", GIT_DESCRIBE);
engine.load(QUrl(QStringLiteral("qrc:/main.qml"))); engine.load(QUrl(QStringLiteral("qrc:/main.qml")));
if (engine.rootObjects().isEmpty()) if (engine.rootObjects().isEmpty())
return -1; return -1;