diff -ruN qt-mac-free-3.3.8/config.tests/mac/mac_version.test qt-mac-free-3.3.8-patched/config.tests/mac/mac_version.test --- qt-mac-free-3.3.8/config.tests/mac/mac_version.test 2004-04-23 09:40:40.000000000 -0700 +++ qt-mac-free-3.3.8-patched/config.tests/mac/mac_version.test 2007-09-10 09:46:37.000000000 -0700 @@ -21,7 +21,7 @@ echo "#include " >>$TSTFILE echo "int main() {" >>$TSTFILE echo " long gestalt_version;" >>$TSTFILE -echo " fprintf(stdout, \"%d\\n\", (Gestalt(gestaltSystemVersion, &gestalt_version) == noErr) ? gestalt_version : 0);" >>$TSTFILE +/bin/echo " fprintf(stdout, \"%d\\n\", (Gestalt(gestaltSystemVersion, &gestalt_version) == noErr) ? gestalt_version : 0);" >>$TSTFILE echo " return 1;" >>$TSTFILE echo "}" >>$TSTFILE diff -ruN qt-mac-free-3.3.8/src/tools/qglobal.h qt-mac-free-3.3.8-patched/src/tools/qglobal.h --- qt-mac-free-3.3.8/src/tools/qglobal.h 2007-02-02 06:01:04.000000000 -0800 +++ qt-mac-free-3.3.8-patched/src/tools/qglobal.h 2007-09-10 09:31:43.000000000 -0700 @@ -183,7 +183,10 @@ # if !defined(MAC_OS_X_VERSION_10_4) # define MAC_OS_X_VERSION_10_4 MAC_OS_X_VERSION_10_3 + 1 # endif -# if (MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_4) +# if !defined(MAC_OS_X_VERSION_10_5) +# define MAC_OS_X_VERSION_10_5 MAC_OS_X_VERSION_10_4 + 1 +# endif +# if (MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_5) # error "This version of Mac OS X is unsupported" # endif #endif --- qt-mac-free-3.3.8/src/kernel/qt_mac.h 2007-02-02 15:01:13.000000000 +0100 +++ qt-mac-free-3.3.8-patched/src/kernel/qt_mac.h 2007-10-29 13:14:12.000000000 +0100 @@ -54,7 +54,7 @@ # define QMAC_DEFAULT_STYLE "QMacStyle" //DefaultStyle #endif -#if !defined(Q_WS_MACX) || QT_MACOSX_VERSION < 0x1020 || QT_MACOSX_VERSION >= 0x1030 +#if !defined(Q_WS_MACX) || QT_MACOSX_VERSION < 0x1020 || (QT_MACOSX_VERSION >= 0x1030 && QT_MACOSX_VERSION <= 0x1040) # define QMAC_NO_FAKECURSOR #endif --- qt-mac-free-3.3.8/src/kernel/qcursor_mac.cpp 2007-02-02 15:01:16.000000000 +0100 +++ qt-mac-free-3.3.8-patched/src/kernel/qcursor_mac.cpp 2007-10-29 15:02:36.000000000 +0100 @@ -177,7 +177,9 @@ #ifdef QMAC_USE_BIG_CURSOR_API char *big_cursor_name; #endif +#ifdef QMAC_NO_FAKECURSOR CursorImageRec *ci; +#endif struct { QMacAnimateCursor *anim; ThemeCursor curs; @@ -257,8 +259,10 @@ if(type == TYPE_CursPtr) { if(curs.cp.hcurs && curs.cp.my_cursor) free(curs.cp.hcurs); +#ifdef QMAC_NO_FAKECURSOR } else if(type == TYPE_CursorImage) { free(curs.ci); +#endif #ifdef QMAC_USE_BIG_CURSOR_API } else if(type == TYPE_BigCursor) { QDUnregisterNamedPixMapCursur(curs.big_cursor_name);