diff options
| author | Morten Sorvig <morten.sorvig@nokia.com> | 2011-11-10 09:36:34 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-11-10 12:55:36 +0100 |
| commit | 95c007e1f5de862429e99f1c94aab1d26cf120cf (patch) | |
| tree | 6004df3ee49bccab3b807d65831e4afe2faa3f2f /src/plugins/platforms/cocoa | |
| parent | 582bb9e467d6bfca3a8a525e478c51cd645a4bc0 (diff) | |
Compile.
QNSPanel must be a NSPanel and not a QNSWindow
subclass.
Change-Id: I1de31e147757824610f4aabc0ef66ae3906dc0f6
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Diffstat (limited to 'src/plugins/platforms/cocoa')
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoawindow.h | 4 | ||||
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoawindow.mm | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoawindow.h b/src/plugins/platforms/cocoa/qcocoawindow.h index 87cd1717da..0b759f3fd4 100644 --- a/src/plugins/platforms/cocoa/qcocoawindow.h +++ b/src/plugins/platforms/cocoa/qcocoawindow.h @@ -60,10 +60,10 @@ QT_BEGIN_NAMESPACE @end -@interface QNSPanel : QNSWindow { +@interface QNSPanel : NSPanel { } - +- (BOOL)canBecomeKeyWindow; @end class QCocoaWindow : public QPlatformWindow diff --git a/src/plugins/platforms/cocoa/qcocoawindow.mm b/src/plugins/platforms/cocoa/qcocoawindow.mm index 3c0c730cff..aef9750acd 100644 --- a/src/plugins/platforms/cocoa/qcocoawindow.mm +++ b/src/plugins/platforms/cocoa/qcocoawindow.mm @@ -69,6 +69,11 @@ @implementation QNSPanel +- (BOOL)canBecomeKeyWindow +{ + return YES; +} + @end QCocoaWindow::QCocoaWindow(QWindow *tlw) |