Ticket #13208: qt3-leopard.diff

config.tests/mac/mac_version.test

@@ -21 +21 @@
 echo "#include <stdio.h>" >>$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
 

src/tools/qglobal.h

@@ -186 +186 @@
 #  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

src/kernel/qt_mac.h

@@ -60 +60 @@
 # 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
 

src/kernel/qcursor_mac.cpp

@@ -183 +183 @@
 #ifdef QMAC_USE_BIG_CURSOR_API
         char *big_cursor_name;
 #endif
+#ifdef QMAC_NO_FAKECURSOR
         CursorImageRec *ci;
+#endif
         struct {
             QMacAnimateCursor *anim;
             ThemeCursor curs;
@@ -263 +265 @@
     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);