Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- --- a/src/3rdparty/webkit/Source/WebKit/qt/QtWebKit.pro
- +++ b/src/3rdparty/webkit/Source/WebKit/qt/QtWebKit.pro
- @@ -247,11 +247,16 @@ contains(DEFINES, ENABLE_VIDEO=1) {
- # We can know the Mac OS version by using the Darwin major version
- DARWIN_VERSION = $$split(QMAKE_HOST.version, ".")
- DARWIN_MAJOR_VERSION = $$first(DARWIN_VERSION)
- - equals(DARWIN_MAJOR_VERSION, "9") | contains(QMAKE_MAC_SDK, "/Developer/SDKs/MacOSX10.5.sdk") {
- +
- + USE_10_5_SDK = $$find(QMAKE_MAC_SDK, "OSX10.5.sdk")
- + USE_10_6_SDK = $$find(QMAKE_MAC_SDK, "OSX10.6.sdk")
- + USE_10_7_SDK = $$find(QMAKE_MAC_SDK, "OSX10.7.sdk")
- +
- + equals(DARWIN_MAJOR_VERSION, "9") | !isEmpty(USE_10_5_SDK){
- LIBS += $$SOURCE_DIR/../WebKitLibraries/libWebKitSystemInterfaceLeopard.a
- - } else: equals(DARWIN_MAJOR_VERSION, "10") | contains(QMAKE_MAC_SDK, "/Developer/SDKs/MacOSX10.6.sdk") {
- + } else: equals(DARWIN_MAJOR_VERSION, "10") | !isEmpty(USE_10_6_SDK){
- LIBS += $$SOURCE_DIR/../WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a
- - } else: equals(DARWIN_MAJOR_VERSION, "11") | contains(QMAKE_MAC_SDK, "/Developer/SDKs/MacOSX10.7.sdk") {
- + } else: equals(DARWIN_MAJOR_VERSION, "11") | !isEmpty(USE_10_7_SDK){
- LIBS += $$SOURCE_DIR/../WebKitLibraries/libWebKitSystemInterfaceLion.a
- }
- }
- --- a/src/plugins/bearer/corewlan/corewlan.pro
- +++ b/src/plugins/bearer/corewlan/corewlan.pro
- @@ -5,7 +5,10 @@ QT = core network
- LIBS += -framework Foundation -framework SystemConfiguration
- contains(QT_CONFIG, corewlan) {
- - isEmpty(QMAKE_MAC_SDK)|contains(QMAKE_MAC_SDK, "/Developer/SDKs/MacOSX10\.[67]\.sdk") {
- + USE_10_6_SDK = $$find(QMAKE_MAC_SDK, "OSX10.6.sdk")
- + USE_10_7_SDK = $$find(QMAKE_MAC_SDK, "OSX10.7.sdk")
- +
- + isEmpty(QMAKE_MAC_SDK)| !empty(USE_10_6_SDK) | !empty(USE_10_7_SDK){
- LIBS += -framework CoreWLAN -framework Security
- }
- }
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement