diff options
| author | Rachel Powers <508861+Ryex@users.noreply.github.com> | 2023-06-26 01:57:23 -0700 |
|---|---|---|
| committer | Rachel Powers <508861+Ryex@users.noreply.github.com> | 2023-07-01 17:03:11 -0700 |
| commit | 671d3c1c80b7d6fbe8910a2070b156c25962b2c9 (patch) | |
| tree | e36e0f2a227810fe1d6a4088509b42fb02dcd25b /launcher/meta/Version.cpp | |
| parent | df18d8560dd4648d21cfdddb463e5e9770a822f7 (diff) | |
| parent | c523765c197cf63d6830d205f1554cd73e38109e (diff) | |
| download | PrismLauncher-671d3c1c80b7d6fbe8910a2070b156c25962b2c9.tar.gz PrismLauncher-671d3c1c80b7d6fbe8910a2070b156c25962b2c9.tar.bz2 PrismLauncher-671d3c1c80b7d6fbe8910a2070b156c25962b2c9.zip | |
Merge branch 'develop' into chore/add-compiler-warnings
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
Diffstat (limited to 'launcher/meta/Version.cpp')
| -rw-r--r-- | launcher/meta/Version.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/launcher/meta/Version.cpp b/launcher/meta/Version.cpp index e617abf8..0718a420 100644 --- a/launcher/meta/Version.cpp +++ b/launcher/meta/Version.cpp @@ -116,9 +116,9 @@ void Meta::Version::setTime(const qint64 time) emit timeChanged(); } -void Meta::Version::setRequires(const Meta::RequireSet &requires, const Meta::RequireSet &conflicts) +void Meta::Version::setRequires(const Meta::RequireSet &reqs, const Meta::RequireSet &conflicts) { - m_requires = requires; + m_requires = reqs; m_conflicts = conflicts; emit requiresChanged(); } |