sascha/cool-retro-term
1
0
Fork 0
mirror of https://github.com/Swordfish90/cool-retro-term.git synced 2025-10-31 07:04:20 +00:00
Code Issues Releases Wiki Activity

Use a single version name.

Browse Source
This commit is contained in:
Filippo Scognamiglio
2019-01-17 22:03:25 +01:00
parent 8f0d1023a4
commit b961109623
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/main.cpp
View File

@@ -74,8 +74,10 @@ int main(int argc, char *argv[])
return 0; return 0;
} }
QString appVersion("1.1.0");
if (args.contains("-v") || args.contains("--version")) { if (args.contains("-v") || args.contains("--version")) {
qDebug() << "cool-retro-term 1.1.0"; qDebug() << ("cool-retro-term " + appVersion).toStdString().c_str();
return 0; return 0;
} }
@@ -86,6 +88,7 @@ int main(int argc, char *argv[])
} }
QVariant command(cmdList.empty() ? QVariant() : cmdList[0]); QVariant command(cmdList.empty() ? QVariant() : cmdList[0]);
QVariant commandArgs(cmdList.size() <= 1 ? QVariant() : QVariant(cmdList.mid(1))); QVariant commandArgs(cmdList.size() <= 1 ? QVariant() : QVariant(cmdList.mid(1)));
engine.rootContext()->setContextProperty("appVersion", appVersion);
engine.rootContext()->setContextProperty("defaultCmd", command); engine.rootContext()->setContextProperty("defaultCmd", command);
engine.rootContext()->setContextProperty("defaultCmdArgs", commandArgs); engine.rootContext()->setContextProperty("defaultCmdArgs", commandArgs);

2
app/qml/ApplicationSettings.qml
View File

@@ -24,7 +24,7 @@ import QtQuick.Controls 1.0
import "utils.js" as Utils import "utils.js" as Utils
QtObject{ QtObject{
readonly property string version: "1.1.0" readonly property string version: appVersion
readonly property int profileVersion: 2 readonly property int profileVersion: 2
// STATIC CONSTANTS //////////////////////////////////////////////////////// // STATIC CONSTANTS ////////////////////////////////////////////////////////