diff options
| author | Morten Johan Sørvig <morten.sorvig@digia.com> | 2013-01-08 13:45:37 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-02-23 08:03:03 +0100 |
| commit | d9b04f8575745f699e39256c3c428e5c08d3bb70 (patch) | |
| tree | 492b970e2714283691e092160d73be617e75b982 /src/plugins/platforms/cocoa/qcocoawindow.h | |
| parent | d7dfab8cacff688b2f048097dc1a50eee81885f1 (diff) | |
QCococaWindow: Add NSView hosting support.
Add and export QCCoocaView::setContentView(NSView *),
making it possible to host a foreign NSView in a QWindow.
Change QCoocaWindow::m_contentView to be a generic
NSView, instead of a QNSView. Add a separate m_qtView
for code paths that expect a QNSView.
Change-Id: I47935b69705c70ea7efbb03d6d4bf489947c3487
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Diffstat (limited to 'src/plugins/platforms/cocoa/qcocoawindow.h')
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoawindow.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoawindow.h b/src/plugins/platforms/cocoa/qcocoawindow.h index 931319190c..2422788f7a 100644 --- a/src/plugins/platforms/cocoa/qcocoawindow.h +++ b/src/plugins/platforms/cocoa/qcocoawindow.h @@ -119,6 +119,7 @@ public: void setParent(const QPlatformWindow *window); NSView *contentView() const; + void setContentView(NSView *contentView); void windowWillMove(); void windowDidMove(); @@ -160,7 +161,8 @@ public: // for QNSView friend class QCocoaBackingStore; friend class QCocoaNativeInterface; - QNSView *m_contentView; + NSView *m_contentView; + QNSView *m_qtView; NSWindow *m_nsWindow; bool m_contentViewIsEmbedded; // true if the m_contentView is embedded in a "foregin" NSView hiearchy |