diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2018-01-09 22:46:34 +0100 |
|---|---|---|
| committer | Daiderd Jordan <daiderd@gmail.com> | 2018-01-09 22:47:34 +0100 |
| commit | 37933209588792db24104dbfaef0106c3bef870d (patch) | |
| tree | 39ff8c0a5b3e677aa6c1e2512aec2ea11fbb8aa5 /pkgs/development/libraries | |
| parent | e5b1a5724e22bbe09966c62c33ed5822268b911d (diff) | |
| download | nixlib-37933209588792db24104dbfaef0106c3bef870d.tar nixlib-37933209588792db24104dbfaef0106c3bef870d.tar.gz nixlib-37933209588792db24104dbfaef0106c3bef870d.tar.bz2 nixlib-37933209588792db24104dbfaef0106c3bef870d.tar.lz nixlib-37933209588792db24104dbfaef0106c3bef870d.tar.xz nixlib-37933209588792db24104dbfaef0106c3bef870d.tar.zst nixlib-37933209588792db24104dbfaef0106c3bef870d.zip | |
qt5-qtbase: update darwin patch
Diffstat (limited to 'pkgs/development/libraries')
| -rw-r--r-- | pkgs/development/libraries/qt-5/5.10/qtbase.patch | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/pkgs/development/libraries/qt-5/5.10/qtbase.patch b/pkgs/development/libraries/qt-5/5.10/qtbase.patch index b8c7f363de8e..06eff174359f 100644 --- a/pkgs/development/libraries/qt-5/5.10/qtbase.patch +++ b/pkgs/development/libraries/qt-5/5.10/qtbase.patch @@ -1082,6 +1082,41 @@ index da63360333..95e34e2e50 100644 xcursorFound = xcursorLib.load(); } if (xcursorFound) { +diff --git a/src/plugins/platforms/cocoa/qcocoawindow.mm b/src/plugins/platforms/cocoa/qcocoawindow.mm +index d1f19f2..1ac2cf1 100644 +--- a/src/plugins/platforms/cocoa/qcocoawindow.mm ++++ b/src/plugins/platforms/cocoa/qcocoawindow.mm +@@ -1699,7 +1699,7 @@ void QCocoaWindow::applyContentBorderThickness(NSWindow *window) + + if (!m_drawContentBorderGradient) { + window.styleMask = window.styleMask & ~NSTexturedBackgroundWindowMask; +- [window.contentView.superview setNeedsDisplay:YES]; ++ [[window.contentView superview] setNeedsDisplay:YES]; + window.titlebarAppearsTransparent = NO; + return; + } +diff --git a/src/plugins/platforms/cocoa/qnswindow.mm b/src/plugins/platforms/cocoa/qnswindow.mm +index e846fa0..4171cd4 100644 +--- a/src/plugins/platforms/cocoa/qnswindow.mm ++++ b/src/plugins/platforms/cocoa/qnswindow.mm +@@ -224,7 +224,7 @@ static bool isMouseEvent(NSEvent *ev) + if (pw->frameStrutEventsEnabled() && isMouseEvent(theEvent)) { + NSPoint loc = [theEvent locationInWindow]; + NSRect windowFrame = [self convertRectFromScreen:self.frame]; +- NSRect contentFrame = self.contentView.frame; ++ NSRect contentFrame = [self.contentView frame]; + if (NSMouseInRect(loc, windowFrame, NO) && !NSMouseInRect(loc, contentFrame, NO)) + [qnsview_cast(pw->view()) handleFrameStrutMouseEvent:theEvent]; + } +@@ -253,7 +253,7 @@ static bool isMouseEvent(NSEvent *ev) + + (void)applicationActivationChanged:(NSNotification*)notification + { + const id sender = self; +- NSEnumerator<NSWindow*> *windowEnumerator = nullptr; ++ NSEnumerator *windowEnumerator = nullptr; + NSApplication *application = [NSApplication sharedApplication]; + + #if QT_MACOS_PLATFORM_SDK_EQUAL_OR_ABOVE(__MAC_10_12) diff --git a/src/plugins/platformthemes/gtk3/main.cpp b/src/plugins/platformthemes/gtk3/main.cpp index c4cd66c33b..b6f2691587 100644 --- a/src/plugins/platformthemes/gtk3/main.cpp |