diff options
| author | Andrew <forkk@forkk.net> | 2013-12-09 12:04:05 -0600 |
|---|---|---|
| committer | Andrew <forkk@forkk.net> | 2013-12-09 12:04:05 -0600 |
| commit | 7f52bed9e3f559adcbcf3f3c1c7ac2251964db8c (patch) | |
| tree | 52097b57dc7d18ec4e35ef3a8e554af2d91545e8 /MultiMCVersion.h | |
| parent | 9410dd042ea62224fa3e0eb3b525abbdf0c316ee (diff) | |
| parent | 220e07aef4a34dca9f31ae0c5bb994e5c594125d (diff) | |
| download | PrismLauncher-7f52bed9e3f559adcbcf3f3c1c7ac2251964db8c.tar.gz PrismLauncher-7f52bed9e3f559adcbcf3f3c1c7ac2251964db8c.tar.bz2 PrismLauncher-7f52bed9e3f559adcbcf3f3c1c7ac2251964db8c.zip | |
Merge branch 'feature_updater' into develop
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; }; |