Attachment 'qt3mac.patch2.txt'

Download

   1 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
   2 --- qt-mac-free-3.3.8/config.tests/mac/mac_version.test	2004-04-23 09:40:40.000000000 -0700
   3 +++ qt-mac-free-3.3.8-patched/config.tests/mac/mac_version.test	2007-09-10 09:46:37.000000000 -0700
   4 @@ -21,7 +21,7 @@
   5  echo "#include <stdio.h>" >>$TSTFILE
   6  echo "int main() {" >>$TSTFILE
   7  echo "  long gestalt_version;" >>$TSTFILE
   8 -echo "  fprintf(stdout, \"%d\\n\", (Gestalt(gestaltSystemVersion, &gestalt_version) == noErr) ? gestalt_version : 0);" >>$TSTFILE
   9 +/bin/echo "  fprintf(stdout, \"%d\\n\", (Gestalt(gestaltSystemVersion, &gestalt_version) == noErr) ? gestalt_version : 0);" >>$TSTFILE
  10  echo "  return 1;" >>$TSTFILE
  11  echo "}" >>$TSTFILE
  12  
  13 diff -ruN qt-mac-free-3.3.8/src/tools/qglobal.h qt-mac-free-3.3.8-patched/src/tools/qglobal.h
  14 --- qt-mac-free-3.3.8/src/tools/qglobal.h	2007-02-02 06:01:04.000000000 -0800
  15 +++ qt-mac-free-3.3.8-patched/src/tools/qglobal.h	2007-09-10 09:31:43.000000000 -0700
  16 @@ -183,7 +183,10 @@
  17  #  if !defined(MAC_OS_X_VERSION_10_4)
  18  #       define MAC_OS_X_VERSION_10_4 MAC_OS_X_VERSION_10_3 + 1
  19  #  endif
  20 -#  if (MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_4)
  21 +#  if !defined(MAC_OS_X_VERSION_10_5)
  22 +#       define MAC_OS_X_VERSION_10_5 MAC_OS_X_VERSION_10_4 + 1
  23 +#  endif
  24 +#  if (MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_5)
  25  #    error "This version of Mac OS X is unsupported"
  26  #  endif
  27  #endif
  28 --- qt-mac-free-3.3.8/src/kernel/qt_mac.h	2007-02-02 15:01:13.000000000 +0100
  29 +++ qt-mac-free-3.3.8-patched/src/kernel/qt_mac.h	2007-10-29 13:14:12.000000000 +0100
  30 @@ -54,7 +54,7 @@
  31  # define QMAC_DEFAULT_STYLE "QMacStyle" //DefaultStyle
  32  #endif
  33  
  34 -#if !defined(Q_WS_MACX) || QT_MACOSX_VERSION < 0x1020 || QT_MACOSX_VERSION >= 0x1030
  35 +#if !defined(Q_WS_MACX) || QT_MACOSX_VERSION < 0x1020 || (QT_MACOSX_VERSION >= 0x1030 && QT_MACOSX_VERSION <= 0x1040)
  36  # define QMAC_NO_FAKECURSOR
  37  #endif
  38  
  39 --- qt-mac-free-3.3.8/src/kernel/qcursor_mac.cpp	2007-02-02 15:01:16.000000000 +0100
  40 +++ qt-mac-free-3.3.8-patched/src/kernel/qcursor_mac.cpp	2007-10-29 15:02:36.000000000 +0100
  41 @@ -177,7 +177,9 @@
  42  #ifdef QMAC_USE_BIG_CURSOR_API
  43  	char *big_cursor_name;
  44  #endif
  45 +#ifdef QMAC_NO_FAKECURSOR
  46  	CursorImageRec *ci;
  47 +#endif
  48  	struct {
  49  	    QMacAnimateCursor *anim;
  50  	    ThemeCursor curs;
  51 @@ -257,8 +259,10 @@
  52      if(type == TYPE_CursPtr) {
  53  	if(curs.cp.hcurs && curs.cp.my_cursor)
  54  	    free(curs.cp.hcurs);
  55 +#ifdef QMAC_NO_FAKECURSOR
  56      } else if(type == TYPE_CursorImage) {
  57  	free(curs.ci);
  58 +#endif
  59  #ifdef QMAC_USE_BIG_CURSOR_API
  60      } else if(type == TYPE_BigCursor) {
  61  	QDUnregisterNamedPixMapCursur(curs.big_cursor_name);

Attached Files

To refer to attachments on a page, use attachment:filename, as shown below in the list of files. Do NOT use the URL of the [get] link, since this is subject to change and can break easily.

You are not allowed to attach a file to this page.