From 2cd4937ddcaa1a97fc86da14c79a795c7a9bd20f Mon Sep 17 00:00:00 2001 From: Christophe Dumez Date: Tue, 17 Aug 2010 10:50:14 +0000 Subject: [PATCH] Mac specific changes by Stephanos Antaris --- src/misc.cpp | 7 ++++--- src/src.pro | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/misc.cpp b/src/misc.cpp index 4b53bf7ff..a1ef16efb 100644 --- a/src/misc.cpp +++ b/src/misc.cpp @@ -54,6 +54,7 @@ const int UNLEN = 256; #ifdef Q_WS_MAC #include +#include #endif #ifndef Q_WS_WIN @@ -210,7 +211,7 @@ void misc::shutdownComputer() { if (error != noErr) { - return(error); + return; } error = AECreateAppleEvent(kCoreEventClass, EventToSend, &targetDesc, @@ -219,7 +220,7 @@ void misc::shutdownComputer() { AEDisposeDesc(&targetDesc); if (error != noErr) { - return(error); + return; } error = AESend(&appleEventToSend, &eventReply, kAENoReply, @@ -228,7 +229,7 @@ void misc::shutdownComputer() { AEDisposeDesc(&appleEventToSend); if (error != noErr) { - return(error); + return; } AEDisposeDesc(&eventReply); diff --git a/src/src.pro b/src/src.pro index aa8097479..f2838a3dc 100644 --- a/src/src.pro +++ b/src/src.pro @@ -74,7 +74,7 @@ macx { DATADIR = /usr/local/share INCLUDEPATH += /usr/local/include/libtorrent /usr/include/openssl /usr/include /opt/local/include/boost /opt/local/include - LIBS += -ltorrent-rasterbar -lcrypto -L/opt/local/lib -lboost_system-mt -lboost_filesystem-mt -lboost_thread-mt -framework Cocoa + LIBS += -ltorrent-rasterbar -lcrypto -L/opt/local/lib -lboost_system-mt -lboost_filesystem-mt -lboost_thread-mt -framework Cocoa -framework Carbon document_icon.path = Contents/Resources document_icon.files = Icons/qBitTorrentDocument.icns @@ -160,7 +160,7 @@ unix { QT += network !contains(DEFINES, DISABLE_GUI):QT += xml -unix { +unix:!macx { QT += dbus }