Advertisement
Guest User

Untitled

a guest
Mar 24th, 2013
73
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
  1. --- a/src/3rdparty/webkit/Source/WebKit/qt/QtWebKit.pro
  2. +++ b/src/3rdparty/webkit/Source/WebKit/qt/QtWebKit.pro
  3. @@ -247,11 +247,16 @@ contains(DEFINES, ENABLE_VIDEO=1) {
  4. # We can know the Mac OS version by using the Darwin major version
  5. DARWIN_VERSION = $$split(QMAKE_HOST.version, ".")
  6. DARWIN_MAJOR_VERSION = $$first(DARWIN_VERSION)
  7. - equals(DARWIN_MAJOR_VERSION, "9") | contains(QMAKE_MAC_SDK, "/Developer/SDKs/MacOSX10.5.sdk") {
  8. +
  9. + USE_10_5_SDK = $$find(QMAKE_MAC_SDK, "OSX10.5.sdk")
  10. + USE_10_6_SDK = $$find(QMAKE_MAC_SDK, "OSX10.6.sdk")
  11. + USE_10_7_SDK = $$find(QMAKE_MAC_SDK, "OSX10.7.sdk")
  12. +
  13. + equals(DARWIN_MAJOR_VERSION, "9") | !isEmpty(USE_10_5_SDK){
  14. LIBS += $$SOURCE_DIR/../WebKitLibraries/libWebKitSystemInterfaceLeopard.a
  15. - } else: equals(DARWIN_MAJOR_VERSION, "10") | contains(QMAKE_MAC_SDK, "/Developer/SDKs/MacOSX10.6.sdk") {
  16. + } else: equals(DARWIN_MAJOR_VERSION, "10") | !isEmpty(USE_10_6_SDK){
  17. LIBS += $$SOURCE_DIR/../WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a
  18. - } else: equals(DARWIN_MAJOR_VERSION, "11") | contains(QMAKE_MAC_SDK, "/Developer/SDKs/MacOSX10.7.sdk") {
  19. + } else: equals(DARWIN_MAJOR_VERSION, "11") | !isEmpty(USE_10_7_SDK){
  20. LIBS += $$SOURCE_DIR/../WebKitLibraries/libWebKitSystemInterfaceLion.a
  21. }
  22. }
  23.  
  24. --- a/src/plugins/bearer/corewlan/corewlan.pro
  25. +++ b/src/plugins/bearer/corewlan/corewlan.pro
  26. @@ -5,7 +5,10 @@ QT = core network
  27. LIBS += -framework Foundation -framework SystemConfiguration
  28.  
  29. contains(QT_CONFIG, corewlan) {
  30. - isEmpty(QMAKE_MAC_SDK)|contains(QMAKE_MAC_SDK, "/Developer/SDKs/MacOSX10\.[67]\.sdk") {
  31. + USE_10_6_SDK = $$find(QMAKE_MAC_SDK, "OSX10.6.sdk")
  32. + USE_10_7_SDK = $$find(QMAKE_MAC_SDK, "OSX10.7.sdk")
  33. +
  34. + isEmpty(QMAKE_MAC_SDK)| !empty(USE_10_6_SDK) | !empty(USE_10_7_SDK){
  35. LIBS += -framework CoreWLAN -framework Security
  36. }
  37. }
Advertisement
Advertisement
Advertisement
RAW Paste Data Copied
Advertisement