diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2010-05-12 10:55:03 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2010-05-12 10:55:03 (GMT) |
| commit | 8191aae91f97c22545750460c7a7d5ef1a7288bd (patch) | |
| tree | c64b8083c005c88c5599d9076b219232a042df0a /src/3rdparty/webkit/WebCore/WebCore.pro | |
| parent | 3eec5af3f07fdab9084f40d6955411a667b433c4 (diff) | |
| download | Qt-8191aae91f97c22545750460c7a7d5ef1a7288bd.zip Qt-8191aae91f97c22545750460c7a7d5ef1a7288bd.tar.gz Qt-8191aae91f97c22545750460c7a7d5ef1a7288bd.tar.bz2 | |
Updated WebKit to dc5821c3df2ef60456d85263160852f5335cf946
Integrated changes:
|| <https://webkit.org/b/32922> || [Qt] fast/text/find-hidden-text.html ||
|| <https://webkit.org/b/36187> || Rename window.media to window.styleMedia ||
|| <https://webkit.org/b/38286> || Need to call FrameView::scrollPositionChanged when changing the scroll position when the ScrollView does not have a platformWidget ||
|| <https://webkit.org/b/37334> || [Qt] fast/frames/flattening/frameset-flattening-subframesets.html fails intermittently on Qt bot ||
Diffstat (limited to 'src/3rdparty/webkit/WebCore/WebCore.pro')
| -rw-r--r-- | src/3rdparty/webkit/WebCore/WebCore.pro | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/3rdparty/webkit/WebCore/WebCore.pro b/src/3rdparty/webkit/WebCore/WebCore.pro index e42cd8e..254d17b 100644 --- a/src/3rdparty/webkit/WebCore/WebCore.pro +++ b/src/3rdparty/webkit/WebCore/WebCore.pro @@ -431,7 +431,6 @@ SOURCES += \ css/FontFamilyValue.cpp \ css/FontValue.cpp \ css/MediaFeatureNames.cpp \ - css/Media.cpp \ css/MediaList.cpp \ css/MediaQuery.cpp \ css/MediaQueryEvaluator.cpp \ @@ -440,6 +439,7 @@ SOURCES += \ css/ShadowValue.cpp \ css/StyleBase.cpp \ css/StyleList.cpp \ + css/StyleMedia.cpp \ css/StyleSheet.cpp \ css/StyleSheetList.cpp \ css/WebKitCSSKeyframeRule.cpp \ @@ -1145,7 +1145,6 @@ HEADERS += \ css/FontFamilyValue.h \ css/FontValue.h \ css/MediaFeatureNames.h \ - css/Media.h \ css/MediaList.h \ css/MediaQueryEvaluator.h \ css/MediaQueryExp.h \ @@ -1154,6 +1153,7 @@ HEADERS += \ css/ShadowValue.h \ css/StyleBase.h \ css/StyleList.h \ + css/StyleMedia.h \ css/StyleSheet.h \ css/StyleSheetList.h \ css/WebKitCSSKeyframeRule.h \ |