pyrox.dev
qt59-qtbase: fix darwin build
+1
-1
pkgs/development/libraries/qt-5/5.9/default.nix
+1
-1
pkgs/development/libraries/qt-5/5.9/default.nix
···
37
37
srcs = import ./srcs.nix { inherit fetchurl; inherit mirror; };
38
38
39
39
patches = {
40
-
qtbase = [ ./qtbase.patch ];
40
+
qtbase = [ ./qtbase.patch ] ++ optional stdenv.isDarwin ./qtbase-darwin.patch;
41
41
qtdeclarative = [ ./qtdeclarative.patch ];
42
42
qtscript = [ ./qtscript.patch ];
43
43
qtserialport = [ ./qtserialport.patch ];
+35
pkgs/development/libraries/qt-5/5.9/qtbase-darwin.patch
+35
pkgs/development/libraries/qt-5/5.9/qtbase-darwin.patch
···
1
+
diff --git a/src/plugins/bearer/corewlan/qcorewlanengine.mm b/src/plugins/bearer/corewlan/qcorewlanengine.mm
2
+
index 341d3bc..3368234 100644
3
+
--- a/src/plugins/bearer/corewlan/qcorewlanengine.mm
4
+
+++ b/src/plugins/bearer/corewlan/qcorewlanengine.mm
5
+
@@ -287,7 +287,7 @@ void QScanThread::getUserConfigurations()
6
+
QMacAutoReleasePool pool;
7
+
userProfiles.clear();
8
+
9
+
- NSArray<NSString *> *wifiInterfaces = [CWWiFiClient interfaceNames];
10
+
+ NSArray *wifiInterfaces = [CWWiFiClient interfaceNames];
11
+
for (NSString *ifName in wifiInterfaces) {
12
+
13
+
CWInterface *wifiInterface = [[CWWiFiClient sharedWiFiClient] interfaceWithName:ifName];
14
+
@@ -602,7 +602,7 @@ void QCoreWlanEngine::doRequestUpdate()
15
+
16
+
QMacAutoReleasePool pool;
17
+
18
+
- NSArray<NSString *> *wifiInterfaces = [CWWiFiClient interfaceNames];
19
+
+ NSArray *wifiInterfaces = [CWWiFiClient interfaceNames];
20
+
for (NSString *ifName in wifiInterfaces) {
21
+
scanThread->interfaceName = QString::fromNSString(ifName);
22
+
scanThread->start();
23
+
diff --git a/src/plugins/platforms/cocoa/qcocoawindow.mm b/src/plugins/platforms/cocoa/qcocoawindow.mm
24
+
index 5cd4beb..84919e6 100644
25
+
--- a/src/plugins/platforms/cocoa/qcocoawindow.mm
26
+
+++ b/src/plugins/platforms/cocoa/qcocoawindow.mm
27
+
@@ -320,7 +320,7 @@ static void qt_closePopups()
28
+
+ (void)applicationActivationChanged:(NSNotification*)notification
29
+
{
30
+
const id sender = self;
31
+
- NSEnumerator<NSWindow*> *windowEnumerator = nullptr;
32
+
+ NSEnumerator *windowEnumerator = nullptr;
33
+
NSApplication *application = [NSApplication sharedApplication];
34
+
35
+
#if QT_MACOS_PLATFORM_SDK_EQUAL_OR_ABOVE(__MAC_10_12)