diff options
author | Petr Mrázek <peterix@gmail.com> | 2013-12-10 07:22:22 +0100 |
---|---|---|
committer | Petr Mrázek <peterix@gmail.com> | 2013-12-10 07:22:22 +0100 |
commit | aa61bbe9e414648399aff2802df5b587dee1a084 (patch) | |
tree | ff7809bea445bb76c9fd27a3245e1b2cb7c72596 /MultiMCVersion.h | |
parent | 3f5c46a1c4b27e82976e0067e4ec2d6abfffd9ba (diff) | |
parent | 712b87c643bbd7bc4ed2cfd459d0b9fdb69e5f0d (diff) | |
download | MultiMC-aa61bbe9e414648399aff2802df5b587dee1a084.tar MultiMC-aa61bbe9e414648399aff2802df5b587dee1a084.tar.gz MultiMC-aa61bbe9e414648399aff2802df5b587dee1a084.tar.lz MultiMC-aa61bbe9e414648399aff2802df5b587dee1a084.tar.xz MultiMC-aa61bbe9e414648399aff2802df5b587dee1a084.zip |
Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop
Conflicts:
CMakeLists.txt
gui/MainWindow.cpp
Diffstat (limited to 'MultiMCVersion.h')
-rw-r--r-- | MultiMCVersion.h | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/MultiMCVersion.h b/MultiMCVersion.h index 863976b2..8978516b 100644 --- a/MultiMCVersion.h +++ b/MultiMCVersion.h @@ -32,8 +32,9 @@ struct MultiMCVersion QString::number(major), QString::number(minor)); - if (build > 0) vstr += QString(".%1").arg(QString::number(build)); - if (!buildType.isEmpty()) vstr += QString("-%1").arg(buildType); + if (build >= 0) vstr += "." + QString::number(build); + if (!channel.isEmpty()) vstr += "-" + channel; + if (!buildType.isEmpty()) vstr += "-" + buildType; return vstr; } @@ -61,9 +62,13 @@ struct MultiMCVersion int build; /*! + * \brief This build's channel. + */ + QString channel; + + /*! * \brief The build type. - * This indicates the type of build that this is. For example, lin64-stable. - * Usually corresponds to this build's buildbot builder name. + * This indicates the type of build that this is. For example, lin64 or custombuild. */ QString buildType; }; |