# HG changeset patch # User luisf # Date 1290094188 0 # Node ID eaabc54de103a1c09fa447abca91a845314bd4cf # Parent 3af5c2b913c714b756f62835d80349f79b05cb5e Foundation framework now included in OSX builds; ifdef bug corrected in common.cpp diff -r 3af5c2b913c7 -r eaabc54de103 common.cpp --- a/common.cpp Thu Nov 18 15:20:40 2010 +0000 +++ b/common.cpp Thu Nov 18 15:29:48 2010 +0000 @@ -95,7 +95,8 @@ return QString::fromUcs2(info); } -#elif Q_OS_MAC +#else +#ifdef Q_OS_MAC // Nothing here: definition is in common_osx.mm #else QString getUserRealName() @@ -113,4 +114,5 @@ return s; } #endif +#endif diff -r 3af5c2b913c7 -r eaabc54de103 easyhg.pro --- a/easyhg.pro Thu Nov 18 15:20:40 2010 +0000 +++ b/easyhg.pro Thu Nov 18 15:29:48 2010 +0000 @@ -55,7 +55,8 @@ selectablelabel.cpp macx-* { -SOURCES += common_osx.mm + SOURCES += common_osx.mm + QMAKE_LFLAGS += -framework Foundation } # ! [0]