Ticket #13208: qt3-leopard.diff

File qt3-leopard.diff, 3.0 KB (added by czhang.web@…, 16 years ago)
  • config.tests/mac/mac_version.test

    ---
     config.tests/mac/mac_version.test |    2 +-
     src/kernel/qcursor_mac.cpp        |    4 ++++
     src/kernel/qt_mac.h               |    2 +-
     src/tools/qglobal.h               |    5 ++++-
     4 files changed, 10 insertions(+), 3 deletions(-)
    
    echo "#include <Carbon/Carbon.h>" >$TSTF 
    2121echo "#include <stdio.h>" >>$TSTFILE
    2222echo "int main() {" >>$TSTFILE
    2323echo "  long gestalt_version;" >>$TSTFILE
    24 echo "  fprintf(stdout, \"%d\\n\", (Gestalt(gestaltSystemVersion, &gestalt_version) == noErr) ? gestalt_version : 0);" >>$TSTFILE
     24/bin/echo "  fprintf(stdout, \"%d\\n\", (Gestalt(gestaltSystemVersion, &gestalt_version) == noErr) ? gestalt_version : 0);" >>$TSTFILE
    2525echo "  return 1;" >>$TSTFILE
    2626echo "}" >>$TSTFILE
    2727
  • src/tools/qglobal.h

     
    186186#  if !defined(MAC_OS_X_VERSION_10_4)
    187187#       define MAC_OS_X_VERSION_10_4 MAC_OS_X_VERSION_10_3 + 1
    188188#  endif
    189 #  if (MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_4)
     189#  if !defined(MAC_OS_X_VERSION_10_5)
     190#       define MAC_OS_X_VERSION_10_5 MAC_OS_X_VERSION_10_4 + 1
     191#  endif
     192#  if (MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_5)
    190193#    error "This version of Mac OS X is unsupported"
    191194#  endif
    192195#endif
  • src/kernel/qt_mac.h

     
    6060# define QMAC_DEFAULT_STYLE "QMacStyle" //DefaultStyle
    6161#endif
    6262
    63 #if !defined(Q_WS_MACX) || QT_MACOSX_VERSION < 0x1020 || QT_MACOSX_VERSION >= 0x1030
     63#if !defined(Q_WS_MACX) || QT_MACOSX_VERSION < 0x1020 || (QT_MACOSX_VERSION >= 0x1030 && QT_MACOSX_VERSION <= 0x1040)
    6464# define QMAC_NO_FAKECURSOR
    6565#endif
    6666
  • src/kernel/qcursor_mac.cpp

    struct QCursorData : public QShared 
    183183#ifdef QMAC_USE_BIG_CURSOR_API
    184184        char *big_cursor_name;
    185185#endif
     186#ifdef QMAC_NO_FAKECURSOR
    186187        CursorImageRec *ci;
     188#endif
    187189        struct {
    188190            QMacAnimateCursor *anim;
    189191            ThemeCursor curs;
    QCursorData::~QCursorData() 
    263265    if(type == TYPE_CursPtr) {
    264266        if(curs.cp.hcurs && curs.cp.my_cursor)
    265267            free(curs.cp.hcurs);
     268#ifdef QMAC_NO_FAKECURSOR
    266269    } else if(type == TYPE_CursorImage) {
    267270        free(curs.ci);
     271#endif
    268272#ifdef QMAC_USE_BIG_CURSOR_API
    269273    } else if(type == TYPE_BigCursor) {
    270274        QDUnregisterNamedPixMapCursur(curs.big_cursor_name);