1 files changed, 45 insertions, 5 deletions
diff --git a/tests/manual/cocoa/qt_on_cocoa/main.mm b/tests/manual/cocoa/qt_on_cocoa/main.mm
index 4ec1ce1e0d..805ef0d7c2 100644
--- a/tests/manual/cocoa/qt_on_cocoa/main.mm
+++ b/tests/manual/cocoa/qt_on_cocoa/main.mm
@@ -33,6 +33,23 @@
 
 #include <AppKit/AppKit.h>
 
+
+@interface ContentView : NSView
+@end
+
+@implementation ContentView
+- (void)drawRect:(NSRect)dirtyRect {
+    [[NSColor whiteColor] setFill];
+    NSRectFill(dirtyRect);
+}
+
+- (void)cursorUpdate:(NSEvent *)theEvent
+{
+    Q_UNUSED(theEvent);
+    [[NSCursor pointingHandCursor] set];
+}
+@end
+
 @interface AppDelegate : NSObject <NSApplicationDelegate> {
     QGuiApplication *m_app;
     QWindow *m_window;
@@ -65,12 +82,35 @@
     [window setTitle:title];
     [window setBackgroundColor:[NSColor blueColor]];
 
-    // Create the QWindow, use its NSView as the content view
-    m_window = new RasterWindow();
-    [window setContentView:reinterpret_cast<NSView *>(m_window->winId())];
+    NSView *contentView = [[[ContentView alloc] initWithFrame:frame] autorelease];
+    [contentView addTrackingArea:[[NSTrackingArea alloc] initWithRect:[contentView frame]
+            options:NSTrackingActiveInActiveApp | NSTrackingInVisibleRect | NSTrackingCursorUpdate
+            owner:contentView userInfo:nil]];
+
+    // Create the QWindow, add its NSView to the content view
+    m_window = new RasterWindow;
+    m_window->setObjectName("RasterWindow");
+    m_window->setCursor(Qt::CrossCursor);
+    m_window->setGeometry(QRect(0, 0, 300, 300));
+
+    QWindow *childWindow = new RasterWindow;
+    childWindow->setObjectName("RasterWindowChild");
+    childWindow->setParent(m_window);
+    childWindow->setCursor(Qt::BusyCursor);
+    childWindow->setGeometry(50, 50, 100, 100);
+
+    NSTextField *textField = [[NSTextField alloc] initWithFrame:NSMakeRect(10, 10, 80, 25)];
+    [(NSView*)childWindow->winId() addSubview:textField];
+
+    [contentView addSubview:reinterpret_cast<NSView *>(m_window->winId())];
+
+    window.contentView = contentView;
 
-    // Show the NSWindow
-    [window makeKeyAndOrderFront:NSApp];
+    // Show the NSWindow delayed, so that we can verify that Qt picks up the right
+    // notifications to expose the window when it does become visible.
+    dispatch_async(dispatch_get_main_queue(), ^{
+        [window makeKeyAndOrderFront:NSApp];
+    });
 }
 
 - (void)applicationWillTerminate:(NSNotification *)notification