From dd8a1eb417c8e73c172e5af621721b75e2adf24f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20=C3=81ngel=20San=20Mart=C3=ADn?= Date: Thu, 6 Nov 2014 19:22:34 +0100 Subject: [PATCH] fixed build and crash in YACReader MacOSX --- YACReader/YACReader.pri | 2 +- custom_widgets/yacreader_macosx_toolbar.mm | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/YACReader/YACReader.pri b/YACReader/YACReader.pri index 44f458b1..11bc6a1c 100644 --- a/YACReader/YACReader.pri +++ b/YACReader/YACReader.pri @@ -46,7 +46,7 @@ macx{ #LIBS += -L/usr/local/lib -lpoppler-qt4 #} CONFIG += objective_c -QT += macextras +QT += macextras gui-private LIBS += -framework Foundation -framework ApplicationServices -framework AppKit diff --git a/custom_widgets/yacreader_macosx_toolbar.mm b/custom_widgets/yacreader_macosx_toolbar.mm index b6ff7aee..ee54dfd5 100644 --- a/custom_widgets/yacreader_macosx_toolbar.mm +++ b/custom_widgets/yacreader_macosx_toolbar.mm @@ -162,6 +162,7 @@ YACReaderMacOSXToolbar::YACReaderMacOSXToolbar(QObject *parent) ((MyToolbarDelegate *)delegate)->mytoolbar = this; [nativeToolBar setDelegate:(MyToolbarDelegate *)delegate]; +#ifdef YACREADER_LIBRARY NSWindow *nswindow = (NSWindow*) qApp->platformNativeInterface()->nativeResourceForWindow("nswindow", ((QMainWindow*)parent)->windowHandle()); if([nswindow respondsToSelector:@selector(setTitleVisibility:)]) { @@ -169,6 +170,8 @@ YACReaderMacOSXToolbar::YACReaderMacOSXToolbar(QObject *parent) [nswindow setTitleVisibility:1]; }else yosemite = false; +#endif + yosemite = false; } void YACReaderMacOSXToolbar::addAction(QAction *action)