diff options
author | Simon Hausmann <simon.hausmann@digia.com> | 2012-11-07 11:22:47 +0100 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-11-07 11:22:47 +0100 |
commit | cfd86b747d32ac22246a1aa908eaa720c63a88c1 (patch) | |
tree | 24d68c6f61c464ecba1e05670b80390ea3b0e50c /Tools/TestWebKitAPI/Tests/WebKit2/WebArchive.cpp | |
parent | 69d7c744c9de19d152dbe2d8e46eb7dfd4511d1a (diff) | |
download | qtwebkit-cfd86b747d32ac22246a1aa908eaa720c63a88c1.tar.gz |
Imported WebKit commit 20271caf2e2c016d5cef40184cddeefeac4f1876 (http://svn.webkit.org/repository/webkit/trunk@133733)
New snapshot that contains all previous fixes as well as build fix for latest QtMultimedia API changes.
Diffstat (limited to 'Tools/TestWebKitAPI/Tests/WebKit2/WebArchive.cpp')
-rw-r--r-- | Tools/TestWebKitAPI/Tests/WebKit2/WebArchive.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Tools/TestWebKitAPI/Tests/WebKit2/WebArchive.cpp b/Tools/TestWebKitAPI/Tests/WebKit2/WebArchive.cpp index 8ca13bc40..7dea31554 100644 --- a/Tools/TestWebKitAPI/Tests/WebKit2/WebArchive.cpp +++ b/Tools/TestWebKitAPI/Tests/WebKit2/WebArchive.cpp @@ -49,8 +49,7 @@ static void didReceiveMessageFromInjectedBundle(WKContextRef, WKStringRef messag size_t size = WKDataGetSize(receivedData); const unsigned char* bytes = WKDataGetBytes(receivedData); RetainPtr<CFDataRef> data(AdoptCF, CFDataCreate(0, bytes, size)); - CFPropertyListFormat format = kCFPropertyListXMLFormat_v1_0 | kCFPropertyListBinaryFormat_v1_0; - RetainPtr<CFPropertyListRef> propertyList(AdoptCF, CFPropertyListCreateWithData(0, data.get(), kCFPropertyListImmutable, &format, 0)); + RetainPtr<CFPropertyListRef> propertyList(AdoptCF, CFPropertyListCreateWithData(0, data.get(), kCFPropertyListImmutable, 0, 0)); EXPECT_TRUE(propertyList); // It should be a dictionary. |