File tree Expand file tree Collapse file tree 3 files changed +8
-4
lines changed Expand file tree Collapse file tree 3 files changed +8
-4
lines changed Original file line number Diff line number Diff line change 2121
2222#import  < CoreServices/CoreServices.h> 
2323#import  < Foundation/Foundation.h> 
24+ #include  < AvailabilityMacros.h> 
2425
2526#include  < QString> 
2627
@@ -53,7 +54,7 @@ Version GetCurrentMacVersionImpl()
5354{
5455    AUTORELEASE_POOL;
5556
56- #if  MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_10 
57+ #if  defined (AVAILABLE_MAC_OS_X_VERSION_10_10_AND_LATER) 
5758    NSProcessInfo  *processInfo = [NSProcessInfo  processInfo ];
5859    if ([processInfo respondsToSelector: @selector (operatingSystemVersion )])
5960    {
@@ -63,7 +64,7 @@ Version GetCurrentMacVersionImpl()
6364#endif 
6465
6566    SInt32 majorVersion = 0 , minorVersion = 0 , bugFixVersion = 0 ;
66- #if  MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_8 
67+ #if  !defined (AVAILABLE_MAC_OS_X_VERSION_10_8_AND_LATER) 
6768    Gestalt (gestaltSystemVersionMajor, &majorVersion);
6869    Gestalt (gestaltSystemVersionMinor, &minorVersion);
6970    Gestalt (gestaltSystemVersionBugFix, &bugFixVersion);
Original file line number Diff line number Diff line change 2121
2222#import  < Foundation/Foundation.h> 
2323#import  < AppKit/AppKit.h> 
24+ #include  < AvailabilityMacros.h> 
2425
2526#include  " ObjectiveCUtils.h" 
2627
Original file line number Diff line number Diff line change 1919
2020#include  " ObjectiveCUtils_mac.h" 
2121
22+ #include  < AvailabilityMacros.h> 
23+ 
2224#include  < cstring> 
2325#include  < algorithm> 
2426
@@ -335,7 +337,7 @@ QPixmap QPixmapFromNSImage(const NSImage *image)
335337    if (!image)
336338        return  pixmap;
337339
338- #if  (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6 )
340+ #if  defined (AVAILABLE_MAC_OS_X_VERSION_10_6_AND_LATER )
339341    if (InfoUtils::MacVersionGreatOrEqual (10 , 6 ))
340342    {
341343        //  https://stackoverflow.com/questions/2548059/turning-an-nsimage-into-a-cgimageref
@@ -384,7 +386,7 @@ QPixmap QPixmapFromNSImage(const NSImage *image)
384386
385387NSImage  *QPixmapToNSImage (const  QPixmap &pixmap)
386388{
387- #if  (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6 )
389+ #if  defined (AVAILABLE_MAC_OS_X_VERSION_10_6_AND_LATER )
388390    if (InfoUtils::MacVersionGreatOrEqual (10 , 6 ))
389391    {
390392        CFRAII<CGImageRef> imageRef = QPixmapToCGImageRef (pixmap);
 
 
   
 
     
   
   
          
    
    
     
    
      
     
     
    You can’t perform that action at this time.
  
 
    
  
    
      
        
     
       
      
     
   
 
    
    
  
 
  
 
     
    
0 commit comments