Merge branch 'master' into cmake_dist

# Conflicts:
#	include/ConfigManager.h
#	include/Engine.h
#	plugins/CMakeLists.txt
#	plugins/vst_base/CMakeLists.txt
#	plugins/vst_base/Win64/CMakeLists.txt
#	src/core/Engine.cpp

include/Engine.h

@@ -27,6 +27,9 @@
 #define ENGINE_H
 
 #include <QtCore/QMap>
+#include <QtCore/QString>
+#include <QtCore/QObject>
+
 
 #include "export.h"
 
@@ -39,8 +42,9 @@ class Song;
 class Ladspa2LMMS;
 
 
-class EXPORT Engine
+class EXPORT Engine : public QObject
 {
+	Q_OBJECT
 public:
 	static void init();
 	static void destroy();
@@ -91,6 +95,19 @@ public:
 	}
 	static void updateFramesPerTick();
 
+	static inline Engine * inst()
+	{
+		if( s_instanceOfMe == NULL )
+		{
+			s_instanceOfMe = new Engine();
+		}
+		return s_instanceOfMe;
+	}
+
+signals:
+	void initProgress(const QString &msg);
+
+
 private:
 	// small helper function which sets the pointer to NULL before actually deleting
 	// the object it refers to
@@ -114,6 +131,9 @@ private:
 
 	static Ladspa2LMMS * s_ladspaManager;
 
+	// even though most methods are static, an instance is needed for Qt slots/signals
+	static Engine * s_instanceOfMe;
+
 	friend class GuiApplication;
 };