diff options
Diffstat (limited to 'src/3rdparty/webkit/Source/WebKit')
| -rw-r--r-- | src/3rdparty/webkit/Source/WebKit/ChangeLog | 7 | ||||
| -rw-r--r-- | src/3rdparty/webkit/Source/WebKit/qt/QtWebKit.pro | 2 |
2 files changed, 9 insertions, 0 deletions
diff --git a/src/3rdparty/webkit/Source/WebKit/ChangeLog b/src/3rdparty/webkit/Source/WebKit/ChangeLog index 20f61f5..8042ee6 100644 --- a/src/3rdparty/webkit/Source/WebKit/ChangeLog +++ b/src/3rdparty/webkit/Source/WebKit/ChangeLog @@ -1,3 +1,10 @@ +2012-07-30 Simon Hausmann <simon.hausmann@nokia.com> + + Unreviewed Qt/Mac build fix: Use libWebKitSystemInterfaceMountainLion.a + on Mountain Lion. + + * qt/QtWebKit.pro: + 2011-06-01 Jer Noble <jer.noble@apple.com> Reviewed by Eric Carlson. diff --git a/src/3rdparty/webkit/Source/WebKit/qt/QtWebKit.pro b/src/3rdparty/webkit/Source/WebKit/qt/QtWebKit.pro index 4161832..847f6f4 100644 --- a/src/3rdparty/webkit/Source/WebKit/qt/QtWebKit.pro +++ b/src/3rdparty/webkit/Source/WebKit/qt/QtWebKit.pro @@ -253,6 +253,8 @@ contains(DEFINES, ENABLE_VIDEO=1) { LIBS += $$SOURCE_DIR/../WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a } else: equals(DARWIN_MAJOR_VERSION, "11") | contains(QMAKE_MAC_SDK, "/Developer/SDKs/MacOSX10.7.sdk") { LIBS += $$SOURCE_DIR/../WebKitLibraries/libWebKitSystemInterfaceLion.a + } else: equals(DARWIN_MAJOR_VERSION, "12") | contains(QMAKE_MAC_SDK, "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk") { + LIBS += $$SOURCE_DIR/../WebKitLibraries/libWebKitSystemInterfaceMountainLion.a } } } |