aboutsummaryrefslogtreecommitdiff
path: root/launcher/meta/Version.cpp
diff options
context:
space:
mode:
authorTrial97 <alexandru.tripon97@gmail.com>2023-06-15 10:35:26 +0300
committerTrial97 <alexandru.tripon97@gmail.com>2023-06-15 10:35:26 +0300
commit182e19eae3e2aa9f50dde140d10db858b5bf6076 (patch)
treee36e6ddfeb937b52208ccd6bd2d9fc10cd6c4a37 /launcher/meta/Version.cpp
parent9ca74cd0095a7e2be40e72e36f5b51dd80f198bb (diff)
parent9908e115aa6bdfcceefd1425406d1b6d1c1bdec4 (diff)
downloadPrismLauncher-182e19eae3e2aa9f50dde140d10db858b5bf6076.tar.gz
PrismLauncher-182e19eae3e2aa9f50dde140d10db858b5bf6076.tar.bz2
PrismLauncher-182e19eae3e2aa9f50dde140d10db858b5bf6076.zip
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop
Diffstat (limited to 'launcher/meta/Version.cpp')
-rw-r--r--launcher/meta/Version.cpp4
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();
}