Merge branch 'develop' of github.com:MultiMC/MultiMC5 into feature_news

Conflicts:
	CMakeLists.txt
	gui/MainWindow.h

1 files changed, 41 insertions, 0 deletions

diff --git a/depends/settings/overridesetting.h b/depends/settings/overridesetting.h
new file mode 100644
index 00000000..5ef901d0
--- /dev/null
+++ b/depends/settings/overridesetting.h
@@ -0,0 +1,41 @@
+/* Copyright 2013 MultiMC Contributors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#pragma once
+
+#include <QObject>
+#include <memory>
+
+#include "setting.h"
+
+#include "libsettings_config.h"
+
+/*!
+ * \brief A setting that 'overrides another.'
+ * This means that the setting's default value will be the value of another setting.
+ * The other setting can be (and usually is) a part of a different SettingsObject
+ * than this one.
+ */
+class LIBSETTINGS_EXPORT OverrideSetting : public Setting
+{
+	Q_OBJECT
+public:
+	explicit OverrideSetting(std::shared_ptr<Setting> other);
+
+	virtual QVariant defValue() const;
+
+protected:
+	std::shared_ptr<Setting> m_other;
+};