diff options
| author | Jocelyn Turcotte <jocelyn.turcotte@nokia.com> | 2009-11-03 16:02:58 (GMT) |
|---|---|---|
| committer | Jocelyn Turcotte <jocelyn.turcotte@nokia.com> | 2009-11-03 16:20:58 (GMT) |
| commit | 4c1ac09381a259e96a1774a5c931c55e8393813f (patch) | |
| tree | d0dd97c5abf5850cd168f7393c5a72446f258c7f /util/webkit/mkdist-webkit | |
| parent | 18b072835e3f726a1d2d7604b0dc98cd420d3088 (diff) | |
| download | Qt-4c1ac09381a259e96a1774a5c931c55e8393813f.zip Qt-4c1ac09381a259e96a1774a5c931c55e8393813f.tar.gz Qt-4c1ac09381a259e96a1774a5c931c55e8393813f.tar.bz2 | |
Update mkdist-webkit script:
- Use newest qtwebkit tag
- Keep BitmapInfo.h and BitmalInfo.cpp in src/3rdparty
Reviewed-by: TrustMe
Diffstat (limited to 'util/webkit/mkdist-webkit')
| -rwxr-xr-x | util/webkit/mkdist-webkit | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/util/webkit/mkdist-webkit b/util/webkit/mkdist-webkit index f88f10e..ddf74bb 100755 --- a/util/webkit/mkdist-webkit +++ b/util/webkit/mkdist-webkit @@ -5,7 +5,7 @@ die() { exit 1 } -default_tag="qtwebkit-4.6-snapshot-22102009" +default_tag="qtwebkit-4.6-snapshot-20091003" if [ $# -eq 0 ]; then tag="$default_tag" @@ -155,7 +155,7 @@ excluded_directories="$excluded_directories WebKit/chromium" excluded_directories="$excluded_directories WebKit/English.lproj WebKit/WebKit.xcodeproj" excluded_directories="$excluded_directories WebCore/English.lproj" -exclude_with_exceptions_list="WebCore/platform/win/:WebCore/platform/win/SystemTimeWin.cpp" +exclude_with_exceptions_list="WebCore/platform/win/:WebCore/platform/win/SystemTimeWin.cpp\\|WebCore/platform/win/BitmapInfo.*" excluded_directories="$excluded_directories WebKit/mac/Carbon" excluded_directories="$excluded_directories WebKit/mac/ChangeLog" |