diff options
| author | Andy Shaw <andy.shaw@digia.com> | 2014-02-07 09:44:12 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-07 14:36:55 +0100 |
| commit | a5878c18c3e41105fbb64e09c6ccbac166a6f08f (patch) | |
| tree | d40a3f9976c82b192f928e21f5de251c6b0aedfc | |
| parent | 811f22d44edc4e57236afef0803ff18504bfedf6 (diff) | |
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 <richard.gustavsen@digia.com>
| -rw-r--r-- | src/gui/kernel/qapplication_mac.mm | 3 |
1 files changed, 2 insertions, 1 deletions
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() { |