diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2018-06-09 22:18:10 +0200 |
|---|---|---|
| committer | Bastian Köcher <git@kchr.de> | 2018-06-12 14:27:11 +0200 |
| commit | 738df73f2acc96f1d06d4ef6b8dbaf8bee7ef9f1 (patch) | |
| tree | d7d8cf8bf8907931996fe7bcb255e555ad049ec8 | |
| parent | 4ed62d6b881241c3d0ed6ad62b0c0514734661bf (diff) | |
| download | nixlib-738df73f2acc96f1d06d4ef6b8dbaf8bee7ef9f1.tar nixlib-738df73f2acc96f1d06d4ef6b8dbaf8bee7ef9f1.tar.gz nixlib-738df73f2acc96f1d06d4ef6b8dbaf8bee7ef9f1.tar.bz2 nixlib-738df73f2acc96f1d06d4ef6b8dbaf8bee7ef9f1.tar.lz nixlib-738df73f2acc96f1d06d4ef6b8dbaf8bee7ef9f1.tar.xz nixlib-738df73f2acc96f1d06d4ef6b8dbaf8bee7ef9f1.tar.zst nixlib-738df73f2acc96f1d06d4ef6b8dbaf8bee7ef9f1.zip | |
qt5: update darwin patch for 5.11
| -rw-r--r-- | pkgs/development/libraries/qt-5/5.11/qtbase-darwin.patch | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/pkgs/development/libraries/qt-5/5.11/qtbase-darwin.patch b/pkgs/development/libraries/qt-5/5.11/qtbase-darwin.patch index 8c9d50bdf5d2..86c55f083989 100644 --- a/pkgs/development/libraries/qt-5/5.11/qtbase-darwin.patch +++ b/pkgs/development/libraries/qt-5/5.11/qtbase-darwin.patch @@ -20,6 +20,20 @@ index 341d3bccf2..3368234c26 100644 for (NSString *ifName in wifiInterfaces) { scanThread->interfaceName = QString::fromNSString(ifName); scanThread->start(); +diff --git a/src/plugins/platforms/cocoa/qcocoascreen.mm b/src/plugins/platforms/cocoa/qcoco +ascreen.mm +index a17a02b6..d76c42fa 100644 +--- a/src/plugins/platforms/cocoa/qcocoascreen.mm ++++ b/src/plugins/platforms/cocoa/qcocoascreen.mm +@@ -114,7 +114,7 @@ void QCocoaScreen::updateGeometry() + return; + + // The reference screen for the geometry is always the primary screen +- QRectF primaryScreenGeometry = QRectF::fromCGRect([[NSScreen screens] firstObject].frame); ++ QRectF primaryScreenGeometry = QRectF::fromCGRect([[[NSScreen screens] firstObject] frame]); + m_geometry = qt_mac_flip(QRectF::fromCGRect(nsScreen.frame), primaryScreenGeometry).toRect(); + m_availableGeometry = qt_mac_flip(QRectF::fromCGRect(nsScreen.visibleFrame), primaryScreenGeometry).toRect(); + diff --git a/src/plugins/platforms/cocoa/qcocoawindow.mm b/src/plugins/platforms/cocoa/qcocoawindow.mm index 54254455e4..e10f62909a 100644 --- a/src/plugins/platforms/cocoa/qcocoawindow.mm |