From ba5d1be9bad0dd8a47329d4058ecd9986721d110 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mart=C3=ADn=20Fern=C3=A1ndez?= Date: Fri, 13 Jul 2018 04:02:43 +0200 Subject: [PATCH] [simple versioning] 1. add application name & version on main.cpp 2. export version to qml and use it on AboutDialog, instead of the property of AppSettings --- app/main.cpp | 7 ++++++- app/qml/AboutDialog.qml | 2 +- app/qml/ApplicationSettings.qml | 1 - 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/app/main.cpp b/app/main.cpp index 28c71e1..b85d364 100644 --- a/app/main.cpp +++ b/app/main.cpp @@ -36,6 +36,10 @@ int main(int argc, char *argv[]) #endif QApplication app(argc, argv); + + app.setApplicationName("cool-retro-term"); + app.setApplicationVersion("1.0.1"); + // set application attributes // Has no effects, see https://bugreports.qt.io/browse/QTBUG-51293 // app.setAttribute(Qt::AA_MacDontSwapCtrlAndMeta, true); @@ -67,7 +71,7 @@ int main(int argc, char *argv[]) } if (args.contains("-v") || args.contains("--version")) { - qDebug() << "cool-retro-term 1.0.1"; + qDebug().noquote() << app.applicationName() << app.applicationVersion(); return 0; } @@ -85,6 +89,7 @@ int main(int argc, char *argv[]) engine.rootContext()->setContextProperty("fileIO", &fileIO); engine.rootContext()->setContextProperty("devicePixelRatio", app.devicePixelRatio()); + engine.rootContext()->setContextProperty("applicationVersion", app.applicationVersion()); // Manage import paths for Linux and OSX. QStringList importPathList = engine.importPathList(); diff --git a/app/qml/AboutDialog.qml b/app/qml/AboutDialog.qml index 3d85b28..23c05f4 100644 --- a/app/qml/AboutDialog.qml +++ b/app/qml/AboutDialog.qml @@ -77,7 +77,7 @@ Window{ Text{ anchors.horizontalCenter: parent.horizontalCenter horizontalAlignment: Text.AlignHCenter - text: appSettings.version + "\n" + + text: applicationVersion + "\n" + qsTr("Author: ") + "Filippo Scognamiglio\n" + qsTr("Email: ") + "flscogna@gmail.com\n" + qsTr("Source: ") + "https://github.com/Swordfish90/cool-retro-term\n" diff --git a/app/qml/ApplicationSettings.qml b/app/qml/ApplicationSettings.qml index 96297b4..359d246 100644 --- a/app/qml/ApplicationSettings.qml +++ b/app/qml/ApplicationSettings.qml @@ -24,7 +24,6 @@ import QtQuick.Controls 1.0 import "utils.js" as Utils QtObject{ - property string version: "1.0.1" // STATIC CONSTANTS ////////////////////////////////////////////////////////