source: trunk/dports/aqua/qt4-mac/files/patch-EXPERIMENTAL-ML-fixes.diff @ 96486

Last change on this file since 96486 was 96486, checked in by michaelld@…, 7 years ago

qt4-mac :
+ Corrects detection of corewlan +universal builds.
+ Removes warnings when building on 10.8.
+ also addresses tickets:

  • #35523 : correctly select the "pg_config" for psql variant selected (if any), to allow building as universal;
  • #34934 : correctly use mach timer info to compute time;
  • #34902 : patch Qt QMake build system to allow full compilation on 32-bit systems;
  • #34864 : correct +framework header links; and
  • #34856 : disable ccache for now; try to fix later; it's involved.
File size: 1.7 KB
  • ./src/3rdparty/webkit/Source/WebKit/qt/QtWebKit.pro

    old new  
    253253            LIBS += $$SOURCE_DIR/../WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a
    254254        } else: equals(DARWIN_MAJOR_VERSION, "11") | contains(QMAKE_MAC_SDK, "/Developer/SDKs/MacOSX10.7.sdk") {
    255255            LIBS += $$SOURCE_DIR/../WebKitLibraries/libWebKitSystemInterfaceLion.a
     256        } else: equals(DARWIN_MAJOR_VERSION, "12") | contains(QMAKE_MAC_SDK, "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk") {
     257            LIBS += $$SOURCE_DIR/../WebKitLibraries/libWebKitSystemInterfaceLion.a
    256258        }
    257259    }
    258260}
  • ./src/corelib/corelib.pro

    old new  
    2727} else:mac|darwin {
    2828        LIBS_PRIVATE += -framework CoreFoundation -framework Security
    2929}
     30
     31LIBS_PRIVATE += -framework Foundation
     32
    3033mac:lib_bundle:DEFINES += QT_NO_DEBUG_PLUGIN_CHECK
    3134win32:DEFINES-=QT_NO_CAST_TO_ASCII
    3235
  • src/corelib/global/qglobal.h

    old new  
    324324#  if !defined(MAC_OS_X_VERSION_10_7)
    325325#       define MAC_OS_X_VERSION_10_7 MAC_OS_X_VERSION_10_6 + 1
    326326#  endif
    327 #  if (MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_7)
     327#  if !defined(MAC_OS_X_VERSION_10_8)
     328#       define MAC_OS_X_VERSION_10_8 MAC_OS_X_VERSION_10_7 + 1
     329#  endif
     330#  if (MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_8)
    328331#    warning "This version of Mac OS X is unsupported"
    329332#  endif
    330333#endif
Note: See TracBrowser for help on using the repository browser.