Merge branch 'master' of https://github.com/jp9000/obs-studio

obs/qt-display.hpp

@@ -17,5 +17,5 @@ public:
 		setAttribute(Qt::WA_NativeWindow);
 	}
 
-	virtual QPaintEngine *paintEngine() const {return nullptr;}
+	virtual QPaintEngine *paintEngine() const override {return nullptr;}
 };

obs/qt-wrappers.cpp

@@ -44,7 +44,7 @@ void QTToGSWindow(QWidget *widget, gs_window &gswindow)
 #ifdef _WIN32
 	gswindow.hwnd = (HWND)widget->winId();
 #elif __APPLE__
-	/* TODO: mac */
+	gswindow.view = (id)widget->winId();
 #else
 	gswindow.id = widget->winId();
 #endif