Summary: | [Qt] Use Qt5.1 supportedMimeTypes methods. | ||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|
Product: | WebKit | Reporter: | Allan Sandfeld Jensen <allan.jensen> | ||||||||
Component: | Page Loading | Assignee: | Allan Sandfeld Jensen <allan.jensen> | ||||||||
Status: | RESOLVED FIXED | ||||||||||
Severity: | Normal | CC: | hausmann, jturcotte, webkit-ews | ||||||||
Priority: | P2 | ||||||||||
Version: | 528+ (Nightly build) | ||||||||||
Hardware: | Unspecified | ||||||||||
OS: | Unspecified | ||||||||||
Attachments: |
|
Description
Allan Sandfeld Jensen
2013-03-01 08:44:07 PST
Created attachment 190971 [details]
Patch
Comment on attachment 190971 [details] Patch Attachment 190971 [details] did not pass qt-ews (qt): Output: http://webkit-commit-queue.appspot.com/results/16836263 Comment on attachment 190971 [details] Patch Attachment 190971 [details] did not pass qt-wk2-ews (qt): Output: http://webkit-commit-queue.appspot.com/results/16867009 Comment on attachment 190971 [details]
Patch
C&P error
Created attachment 190979 [details]
Patch
Comment on attachment 190979 [details] Patch View in context: https://bugs.webkit.org/attachment.cgi?id=190979&action=review We should remove the old code as soon as 5.1 has been released, those ifdef are getting heavy. > Source/WebCore/platform/MIMETypeRegistry.cpp:248 > +#if QT_VERSION >= 0x050100 #if QT_VERSION >= QT_VERSION_CHECK(5, 1, 0) > Source/WebCore/platform/MIMETypeRegistry.cpp:265 > + // Don't treat SVG as images directly if we can handle them internally. "internally" is ambiguous, adding something like "let WebKit handle them" could help. > Source/WebCore/platform/MIMETypeRegistry.cpp:295 > +#if QT_VERSION >= 0x050100 ditto > Source/WebCore/platform/MIMETypeRegistry.cpp:307 > +#endif This could deserve a "// QT_VERSION" as well Created attachment 191978 [details]
Patch
Committed r145066: <http://trac.webkit.org/changeset/145066> |