From 85ae710d407eb31527183d5f8bec0399eb209f33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= <peterix@gmail.com>
Date: Sat, 11 Nov 2017 01:38:31 +0100
Subject: GH-2026 implement changes necessary to support 1.13 snapshots

---
 api/logic/meta/Version.cpp | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

(limited to 'api/logic/meta/Version.cpp')

diff --git a/api/logic/meta/Version.cpp b/api/logic/meta/Version.cpp
index bf739157..d82878a1 100644
--- a/api/logic/meta/Version.cpp
+++ b/api/logic/meta/Version.cpp
@@ -74,12 +74,20 @@ void Meta::Version::merge(const std::shared_ptr<BaseEntity> &other)
 	}
 	if (m_requires != version->m_requires)
 	{
-		setRequires(version->m_requires);
+		m_requires = version->m_requires;
+	}
+	if (m_conflicts != version->m_conflicts)
+	{
+		m_conflicts = version->m_conflicts;
 	}
 	if (m_parentUid != version->m_parentUid)
 	{
 		setParentUid(version->m_parentUid);
 	}
+	if(m_volatile != version->m_volatile)
+	{
+		setVolatile(version->m_volatile);
+	}
 	if(version->m_data)
 	{
 		setData(version->m_data);
@@ -109,12 +117,19 @@ void Meta::Version::setTime(const qint64 time)
 	emit timeChanged();
 }
 
-void Meta::Version::setRequires(const QHash<QString, QString> &requires)
+void Meta::Version::setRequires(const Meta::RequireSet &requires, const Meta::RequireSet &conflicts)
 {
 	m_requires = requires;
+	m_conflicts = conflicts;
 	emit requiresChanged();
 }
 
+void Meta::Version::setVolatile(bool volatile_)
+{
+	m_volatile = volatile_;
+}
+
+
 void Meta::Version::setData(const VersionFilePtr &data)
 {
 	m_data = data;
-- 
cgit v1.2.3