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

Conflicts:
	CMakeLists.txt
	gui/MainWindow.h

2 files changed, 15 insertions, 0 deletions

diff --git a/logger/QsLogDest.cpp b/logger/QsLogDest.cpp
index 2fd29b23..4a47060e 100644
--- a/logger/QsLogDest.cpp
+++ b/logger/QsLogDest.cpp
@@ -77,6 +77,15 @@ void DebugOutputDestination::write(const QString &message)
 	QsDebugOutput::output(message);
 }
 
+class QDebugDestination : public Destination
+{
+public:
+	virtual void write(const QString &message)
+	{
+		qDebug() << message;
+	};
+};
+
 DestinationPtr DestinationFactory::MakeFileDestination(const QString &filePath)
 {
 	return DestinationPtr(new FileDestination(filePath));
@@ -87,4 +96,9 @@ DestinationPtr DestinationFactory::MakeDebugOutputDestination()
 	return DestinationPtr(new DebugOutputDestination);
 }
 
+DestinationPtr DestinationFactory::MakeQDebugDestination()
+{
+	return DestinationPtr(new QDebugDestination);
+}
+
 } // end namespace
diff --git a/logger/QsLogDest.h b/logger/QsLogDest.h
index e7fcc045..a8000022 100644
--- a/logger/QsLogDest.h
+++ b/logger/QsLogDest.h
@@ -47,6 +47,7 @@ class DestinationFactory
 public:
 	static DestinationPtr MakeFileDestination(const QString &filePath);
 	static DestinationPtr MakeDebugOutputDestination();
+	static DestinationPtr MakeQDebugDestination();
 };
 
 } // end namespace