Correct redundant version string
This commit is contained in:
@@ -40,11 +40,9 @@ win32 {
|
||||
DEFINES += _WIN32_WINNT=0x06010000
|
||||
}
|
||||
|
||||
GIT_TAG = $$system(git describe --tags)
|
||||
GIT_SHA = $$system(git rev-parse --short HEAD)
|
||||
GIT_DESCRIBE = $$system(git describe --tags)
|
||||
|
||||
DEFINES += GIT_TAG=\\\"$$GIT_TAG\\\" \
|
||||
GIT_SHA=\\\"$$GIT_SHA\\\"
|
||||
DEFINES += GIT_DESCRIBE=\\\"$$GIT_DESCRIBE\\\"
|
||||
|
||||
DISTFILES += \
|
||||
README.md
|
||||
|
||||
@@ -36,7 +36,7 @@ int main(int argc, char *argv[])
|
||||
return Control::instance();
|
||||
});
|
||||
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")));
|
||||
if (engine.rootObjects().isEmpty())
|
||||
return -1;
|
||||
|
||||
Reference in New Issue
Block a user