Improved support for Mac OS X:

1) Application now builds correctly for both 
   x86 and x86_64 architectures on Mac OS X 10.6 and 10.7
   thanks to fixes in iconv.h
2) The 'unix' branch in goldendict.pro is skipped for Mac now.
3) The sluggishness of scrolling is gone after setting Qt
   graphics system to "raster" at the application launch.

Signed-off-by: Denis Loginov <dinvlad@gmail.com>

goldendict.pro

@@ -55,7 +55,7 @@ win32 {
     Release:DEFINES += NO_CONSOLE
 }
 
-unix {
+unix:!mac {
   # This is to keep symbols for backtraces
   QMAKE_CXXFLAGS += -rdynamic
   QMAKE_LFLAGS += -rdynamic
@@ -89,20 +89,15 @@ unix {
     INSTALLS += desktops2
 }
 mac {
-    contains(QMAKE_HOST.arch, x86_64) {
-        CONFIG += x86 x86_64
-    } else {
-        CONFIG += x86
-    }
+    CONFIG += x86 x86_64
     LIBS = -lz \
         -liconv \
         -lvorbisfile \
         -lvorbis \
         -logg \
         -lhunspell-1.3
     INCLUDEPATH = maclibs/include
-    LIBS += -Lmaclibs/lib \
-        -L/usr/lib
+    LIBS += -Lmaclibs/lib
     ICON = icons/macicon.icns
 }
 DEFINES += PROGRAM_VERSION=\\\"$$VERSION\\\"

maclibs/include/iconv.h

@@ -74,7 +74,7 @@ extern "C" {
 /* Allocates descriptor for code conversion from encoding ‘fromcode’ to
    encoding ‘tocode’. */
 #ifndef LIBICONV_PLUG
-#define iconv_open libiconv_open
+#define iconv_open iconv_open
 #endif
 extern LIBICONV_DLL_EXPORTED iconv_t iconv_open (const char* tocode, const char* fromcode);
 
@@ -84,13 +84,13 @@ extern LIBICONV_DLL_EXPORTED iconv_t iconv_open (const char* tocode, const char*
    Decrements ‘*inbytesleft’ and increments ‘*inbuf’ by the same amount.
    Decrements ‘*outbytesleft’ and increments ‘*outbuf’ by the same amount. */
 #ifndef LIBICONV_PLUG
-#define iconv libiconv
+#define iconv iconv
 #endif
 extern LIBICONV_DLL_EXPORTED size_t iconv (iconv_t cd,  char* * inbuf, size_t *inbytesleft, char* * outbuf, size_t *outbytesleft);
 
 /* Frees resources allocated for conversion descriptor ‘cd’. */
 #ifndef LIBICONV_PLUG
-#define iconv_close libiconv_close
+#define iconv_close iconv_close
 #endif
 extern LIBICONV_DLL_EXPORTED int iconv_close (iconv_t cd);