diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-07-24 17:03:20 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-07-24 17:03:20 +0200 |
| commit | 08d4a74d56ca431877819fc4566e27eafe150342 (patch) | |
| tree | ebd8530838ab390c015c6b7e659a22852c1663ae /WebKitLibraries | |
| parent | 1de6cd4794bbd5a52189384189a2b8df1848b39b (diff) | |
Imported WebKit commit 0fbd41c4e13f5a190faf160bf993eee614e6e18e (http://svn.webkit.org/repository/webkit/trunk@123477)
New snapshot that adapts to latest Qt API changes
Diffstat (limited to 'WebKitLibraries')
| -rw-r--r-- | WebKitLibraries/ChangeLog | 13 | ||||
| -rw-r--r-- | WebKitLibraries/win/tools/vsprops/FeatureDefines.vsprops | 2 |
2 files changed, 14 insertions, 1 deletions
diff --git a/WebKitLibraries/ChangeLog b/WebKitLibraries/ChangeLog index 34bb398c3..5d84c3f0e 100644 --- a/WebKitLibraries/ChangeLog +++ b/WebKitLibraries/ChangeLog @@ -1,3 +1,16 @@ +2012-07-23 Roger Fong <roger_fong@apple.com> + + Disable flexbox on Windows + https://bugs.webkit.org/show_bug.cgi?id=92047 + <rdar://problem/11570384> + + Reviewed by Darin Adler. + + Disabled Flexbox CSS3 syntax on Mac, need to do the same for Windows. + + * win/tools/vsprops/FeatureDefines.vsprops: + Disable ENABLE_CSS3_FLEXBOX property. + 2012-07-23 Kent Tamura <tkent@chromium.org> Rename ENABLE_METER_TAG and ENABLE_PROGRESS_TAG to ENABLE_METER_ELEMENT and ENABLE_PROGRESS_ELEMENT respectively diff --git a/WebKitLibraries/win/tools/vsprops/FeatureDefines.vsprops b/WebKitLibraries/win/tools/vsprops/FeatureDefines.vsprops index 6312f20e3..f36cf2760 100644 --- a/WebKitLibraries/win/tools/vsprops/FeatureDefines.vsprops +++ b/WebKitLibraries/win/tools/vsprops/FeatureDefines.vsprops @@ -38,7 +38,7 @@ /> <UserMacro Name="ENABLE_CSS3_FLEXBOX" - Value="ENABLE_CSS3_FLEXBOX" + Value="" PerformEnvironmentSet="true" /> <UserMacro |