diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-07-30 09:33:19 (GMT) |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-30 12:11:07 (GMT) |
| commit | 112c6609c0ffff20cea598a78ece549e676fbc95 (patch) | |
| tree | 09dade2046690babfb23467c5820636249bde5f8 /src | |
| parent | 3bbe09626077576299df790db329bdd5c51be7fe (diff) | |
| download | Qt-112c6609c0ffff20cea598a78ece549e676fbc95.zip Qt-112c6609c0ffff20cea598a78ece549e676fbc95.tar.gz Qt-112c6609c0ffff20cea598a78ece549e676fbc95.tar.bz2 | |
Updated WebKit to 9c682c404770cfb2eddf705be593824e06f8ec40
Prospective build fix for Mac OS X Mountain Lion
Change-Id: Ia6e83bba30788cd473bd01f7217e6153970f60be
Reviewed-by: Mike McQuaid <mike@mikemcquaid.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/3rdparty/webkit/.tag | 2 | ||||
| -rw-r--r-- | src/3rdparty/webkit/Source/WebKit/ChangeLog | 7 | ||||
| -rw-r--r-- | src/3rdparty/webkit/Source/WebKit/qt/QtWebKit.pro | 2 | ||||
| -rw-r--r-- | src/3rdparty/webkit/VERSION | 2 | ||||
| -rw-r--r-- | src/3rdparty/webkit/WebKitLibraries/libWebKitSystemInterfaceMountainLion.a | bin | 0 -> 647568 bytes |
5 files changed, 11 insertions, 2 deletions
diff --git a/src/3rdparty/webkit/.tag b/src/3rdparty/webkit/.tag index 72bb56d..9dca1ea 100644 --- a/src/3rdparty/webkit/.tag +++ b/src/3rdparty/webkit/.tag @@ -1 +1 @@ -0b63152ae5d572c4a817a53210d8907f3dd11bd7 +9c682c404770cfb2eddf705be593824e06f8ec40 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 } } } diff --git a/src/3rdparty/webkit/VERSION b/src/3rdparty/webkit/VERSION index d4952bf..4ef92bd 100644 --- a/src/3rdparty/webkit/VERSION +++ b/src/3rdparty/webkit/VERSION @@ -4,4 +4,4 @@ This is a snapshot of the Qt port of WebKit from and has the sha1 checksum - 0b63152ae5d572c4a817a53210d8907f3dd11bd7 + 9c682c404770cfb2eddf705be593824e06f8ec40 diff --git a/src/3rdparty/webkit/WebKitLibraries/libWebKitSystemInterfaceMountainLion.a b/src/3rdparty/webkit/WebKitLibraries/libWebKitSystemInterfaceMountainLion.a Binary files differnew file mode 100644 index 0000000..ce7db6a --- /dev/null +++ b/src/3rdparty/webkit/WebKitLibraries/libWebKitSystemInterfaceMountainLion.a |