qt59-qtbase: fix darwin build
This commit is contained in:
parent
274de25f5f
commit
0905e5e23a
@ -37,7 +37,7 @@ let
|
|||||||
srcs = import ./srcs.nix { inherit fetchurl; inherit mirror; };
|
srcs = import ./srcs.nix { inherit fetchurl; inherit mirror; };
|
||||||
|
|
||||||
patches = {
|
patches = {
|
||||||
qtbase = [ ./qtbase.patch ];
|
qtbase = [ ./qtbase.patch ] ++ optional stdenv.isDarwin ./qtbase-darwin.patch;
|
||||||
qtdeclarative = [ ./qtdeclarative.patch ];
|
qtdeclarative = [ ./qtdeclarative.patch ];
|
||||||
qtscript = [ ./qtscript.patch ];
|
qtscript = [ ./qtscript.patch ];
|
||||||
qtserialport = [ ./qtserialport.patch ];
|
qtserialport = [ ./qtserialport.patch ];
|
||||||
|
35
pkgs/development/libraries/qt-5/5.9/qtbase-darwin.patch
Normal file
35
pkgs/development/libraries/qt-5/5.9/qtbase-darwin.patch
Normal file
@ -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)
|
Loading…
x
Reference in New Issue
Block a user