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 21 21 echo "#include <stdio.h>" >>$TSTFILE 22 22 echo "int main() {" >>$TSTFILE 23 23 echo " long gestalt_version;" >>$TSTFILE 24 echo " fprintf(stdout, \"%d\\n\", (Gestalt(gestaltSystemVersion, &gestalt_version) == noErr) ? gestalt_version : 0);" >>$TSTFILE24 /bin/echo " fprintf(stdout, \"%d\\n\", (Gestalt(gestaltSystemVersion, &gestalt_version) == noErr) ? gestalt_version : 0);" >>$TSTFILE 25 25 echo " return 1;" >>$TSTFILE 26 26 echo "}" >>$TSTFILE 27 27 -
src/tools/qglobal.h
186 186 # if !defined(MAC_OS_X_VERSION_10_4) 187 187 # define MAC_OS_X_VERSION_10_4 MAC_OS_X_VERSION_10_3 + 1 188 188 # 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) 190 193 # error "This version of Mac OS X is unsupported" 191 194 # endif 192 195 #endif -
src/kernel/qt_mac.h
60 60 # define QMAC_DEFAULT_STYLE "QMacStyle" //DefaultStyle 61 61 #endif 62 62 63 #if !defined(Q_WS_MACX) || QT_MACOSX_VERSION < 0x1020 || QT_MACOSX_VERSION >= 0x103063 #if !defined(Q_WS_MACX) || QT_MACOSX_VERSION < 0x1020 || (QT_MACOSX_VERSION >= 0x1030 && QT_MACOSX_VERSION <= 0x1040) 64 64 # define QMAC_NO_FAKECURSOR 65 65 #endif 66 66 -
src/kernel/qcursor_mac.cpp
struct QCursorData : public QShared 183 183 #ifdef QMAC_USE_BIG_CURSOR_API 184 184 char *big_cursor_name; 185 185 #endif 186 #ifdef QMAC_NO_FAKECURSOR 186 187 CursorImageRec *ci; 188 #endif 187 189 struct { 188 190 QMacAnimateCursor *anim; 189 191 ThemeCursor curs; … … QCursorData::~QCursorData() 263 265 if(type == TYPE_CursPtr) { 264 266 if(curs.cp.hcurs && curs.cp.my_cursor) 265 267 free(curs.cp.hcurs); 268 #ifdef QMAC_NO_FAKECURSOR 266 269 } else if(type == TYPE_CursorImage) { 267 270 free(curs.ci); 271 #endif 268 272 #ifdef QMAC_USE_BIG_CURSOR_API 269 273 } else if(type == TYPE_BigCursor) { 270 274 QDUnregisterNamedPixMapCursur(curs.big_cursor_name);