Merge branch 'develop' into jsonrpc

Conflicts:
	rpc/ws/server.go

1 files changed, 6 insertions, 0 deletions

diff --git a/ui/qt/webengine/cpp/webengine.cpp b/ui/qt/webengine/cpp/webengine.cpp
new file mode 100644
index 000000000..118b451ef
--- /dev/null
+++ b/ui/qt/webengine/cpp/webengine.cpp
@@ -0,0 +1,6 @@
+#include <QtWebEngine>
+#include "webengine.h"
+
+void webengineInitialize() {
+	QtWebEngine::initialize();
+}