Mercurial > hg > easyhg

changeset 71:eaabc54de103

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Foundation framework now included in OSX builds; ifdef bug corrected in common.cpp
author luisf
date Thu, 18 Nov 2010 15:29:48 +0000
parents 3af5c2b913c7
children 121cb1032717
files common.cpp easyhg.pro
diffstat 2 files changed, 5 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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
 
--- 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]