about summary refs log tree commit diff
path: root/pkgs/development/libraries/qt-5/5.9/qtbase-darwin.patch
diff options
context:
space:
mode:
authorDaiderd Jordan <daiderd@gmail.com>2018-02-10 01:04:56 +0100
committerDaiderd Jordan <daiderd@gmail.com>2018-02-10 20:30:38 +0100
commit0905e5e23affddfe1857a41266e336926bfec546 (patch)
tree190521f2831e48f4c83244064a826d6dc759ef1d /pkgs/development/libraries/qt-5/5.9/qtbase-darwin.patch
parent274de25f5f1f075963be7e38399a6c6312ecdf72 (diff)
downloadnixlib-0905e5e23affddfe1857a41266e336926bfec546.tar
nixlib-0905e5e23affddfe1857a41266e336926bfec546.tar.gz
nixlib-0905e5e23affddfe1857a41266e336926bfec546.tar.bz2
nixlib-0905e5e23affddfe1857a41266e336926bfec546.tar.lz
nixlib-0905e5e23affddfe1857a41266e336926bfec546.tar.xz
nixlib-0905e5e23affddfe1857a41266e336926bfec546.tar.zst
nixlib-0905e5e23affddfe1857a41266e336926bfec546.zip
qt59-qtbase: fix darwin build
Diffstat (limited to 'pkgs/development/libraries/qt-5/5.9/qtbase-darwin.patch')
-rw-r--r--pkgs/development/libraries/qt-5/5.9/qtbase-darwin.patch35
1 files changed, 35 insertions, 0 deletions
diff --git a/pkgs/development/libraries/qt-5/5.9/qtbase-darwin.patch b/pkgs/development/libraries/qt-5/5.9/qtbase-darwin.patch
new file mode 100644
index 000000000000..875fba12e2fb
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.9/qtbase-darwin.patch
@@ -0,0 +1,35 @@
+diff --git a/src/plugins/bearer/corewlan/qcorewlanengine.mm b/src/plugins/bearer/corewlan/qcorewlanengine.mm
+index 341d3bc..3368234 100644
+--- a/src/plugins/bearer/corewlan/qcorewlanengine.mm
++++ b/src/plugins/bearer/corewlan/qcorewlanengine.mm
+@@ -287,7 +287,7 @@ void QScanThread::getUserConfigurations()
+     QMacAutoReleasePool pool;
+     userProfiles.clear();
+ 
+-    NSArray<NSString *> *wifiInterfaces = [CWWiFiClient interfaceNames];
++    NSArray *wifiInterfaces = [CWWiFiClient interfaceNames];
+     for (NSString *ifName in wifiInterfaces) {
+ 
+         CWInterface *wifiInterface = [[CWWiFiClient sharedWiFiClient] interfaceWithName:ifName];
+@@ -602,7 +602,7 @@ void QCoreWlanEngine::doRequestUpdate()
+ 
+     QMacAutoReleasePool pool;
+ 
+-    NSArray<NSString *> *wifiInterfaces = [CWWiFiClient interfaceNames];
++    NSArray *wifiInterfaces = [CWWiFiClient interfaceNames];
+     for (NSString *ifName in wifiInterfaces) {
+             scanThread->interfaceName = QString::fromNSString(ifName);
+             scanThread->start();
+diff --git a/src/plugins/platforms/cocoa/qcocoawindow.mm b/src/plugins/platforms/cocoa/qcocoawindow.mm
+index 5cd4beb..84919e6 100644
+--- a/src/plugins/platforms/cocoa/qcocoawindow.mm
++++ b/src/plugins/platforms/cocoa/qcocoawindow.mm
+@@ -320,7 +320,7 @@ static void qt_closePopups()
+ + (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)