From a5878c18c3e41105fbb64e09c6ccbac166a6f08f Mon Sep 17 00:00:00 2001 From: Andy Shaw Date: Fri, 7 Feb 2014 09:44:12 +0100 Subject: Fix compile for Carbon Protect the usage of qt_mac_loadMenuNib so it is only used on Cocoa as this call is not used in Carbon code. Change-Id: I93b9b513dce934680e1d5e1fb26bf2a64e25c764 Reviewed-by: Richard Moe Gustavsen --- src/gui/kernel/qapplication_mac.mm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/gui/kernel/qapplication_mac.mm b/src/gui/kernel/qapplication_mac.mm index 14116c7c89..b5afcde666 100644 --- a/src/gui/kernel/qapplication_mac.mm +++ b/src/gui/kernel/qapplication_mac.mm @@ -226,6 +226,7 @@ extern void qt_mac_update_cursor(); // qcursor_mac.mm void onApplicationWindowChangedActivation( QWidget*widget, bool activated ); void onApplicationChangedActivation( bool activated ); +#ifdef QT_MAC_USE_COCOA void qt_mac_loadMenuNib(QT_MANGLE_NAMESPACE(QCocoaMenuLoader) *qtMenuLoader) { // Create qt_menu.nib dir in temp. @@ -258,7 +259,7 @@ void qt_mac_loadMenuNib(QT_MANGLE_NAMESPACE(QCocoaMenuLoader) *qtMenuLoader) if (!ok) qWarning("qt_mac_loadMenuNib: could not instantiate nib"); } - +#endif static void qt_mac_read_fontsmoothing_settings() { -- cgit v1.2.3