Port Qt 5 to Mac.

1 files changed, 10 insertions, 5 deletions

diff --git a/src/plugins/platforms/cocoa/qcocoawindow.h b/src/plugins/platforms/cocoa/qcocoawindow.h
index b71879de41..98e3de29cb 100644
--- a/src/plugins/platforms/cocoa/qcocoawindow.h
+++ b/src/plugins/platforms/cocoa/qcocoawindow.h
@@ -46,27 +46,32 @@
 
 #include <QPlatformWindow>
 
+#include "qcocoaglcontext.h"
+#include "qnsview.h"
+
 QT_BEGIN_NAMESPACE
 
 class QCocoaWindow : public QPlatformWindow
 {
 public:
-    QCocoaWindow(QWidget *tlw);
+    QCocoaWindow(QWindow *tlw);
     ~QCocoaWindow();
 
     void setGeometry(const QRect &rect);
-
     void setVisible(bool visible);
-
     WId winId() const;
-
     NSView *contentView() const;
-    void setContentView(NSView *contentView);
 
     void windowDidResize();
 
+    QPlatformGLContext *glContext() const;
+
 private:
+    friend class QCocoaWindowSurface;
     NSWindow *m_nsWindow;
+    QNSView *m_contentView;
+    NSView *m_windowSurfaceView;
+    mutable QCocoaGLContext *m_glContext;
 };
 
 QT_END_NAMESPACE