From 95c007e1f5de862429e99f1c94aab1d26cf120cf Mon Sep 17 00:00:00 2001 From: Morten Sorvig Date: Thu, 10 Nov 2011 09:36:34 +0100 Subject: [PATCH] Compile. QNSPanel must be a NSPanel and not a QNSWindow subclass. Change-Id: I1de31e147757824610f4aabc0ef66ae3906dc0f6 Reviewed-by: Bradley T. Hughes --- src/plugins/platforms/cocoa/qcocoawindow.h | 4 ++-- 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)