mirror of
https://github.com/Stichting-MINIX-Research-Foundation/pkgsrc-ng.git
synced 2025-09-07 03:07:02 -04:00
21 lines
1.1 KiB
Plaintext
21 lines
1.1 KiB
Plaintext
$NetBSD: patch-cb,v 1.4 2012/01/12 22:59:58 adam Exp $
|
|
|
|
--- src/gui/kernel/qapplication_mac.mm.orig 2011-12-08 05:06:02.000000000 +0000
|
|
+++ src/gui/kernel/qapplication_mac.mm
|
|
@@ -1257,12 +1257,14 @@ void qt_init(QApplicationPrivate *priv,
|
|
[cocoaApp setDelegate:newDelegate];
|
|
|
|
QT_MANGLE_NAMESPACE(QCocoaMenuLoader) *qtMenuLoader = [[QT_MANGLE_NAMESPACE(QCocoaMenuLoader) alloc] init];
|
|
- if ([NSBundle loadNibNamed:@"qt_menu" owner:qtMenuLoader] == false) {
|
|
+ NSNib *qtNib = [[NSNib alloc] initWithContentsOfURL:[NSURL fileURLWithPath:@"@QTPREFIX@/qt_menu.nib"]];
|
|
+ if ([qtNib instantiateNibWithOwner:qtMenuLoader topLevelObjects:nil] == false) {
|
|
qFatal("Qt internal error: qt_menu.nib could not be loaded. The .nib file"
|
|
" should be placed in QtGui.framework/Versions/Current/Resources/ "
|
|
" or in the resources directory of your application bundle.");
|
|
}
|
|
|
|
+ [qtNib release];
|
|
[cocoaApp setMenu:[qtMenuLoader menu]];
|
|
[newDelegate setMenuLoader:qtMenuLoader];
|
|
[qtMenuLoader release];
|