diff options
| author | Jason Barron <jbarron@trolltech.com> | 2009-07-30 13:28:49 (GMT) |
|---|---|---|
| committer | Jason Barron <jbarron@trolltech.com> | 2009-07-30 13:28:49 (GMT) |
| commit | a08b3f5336e5c819b33d922d3a809b5203d728f3 (patch) | |
| tree | 952f42304d50f28ed6651bace587ab7935b29cd0 /util | |
| parent | 813fc3574a006cb2687715ccf7bdb984a485b173 (diff) | |
| parent | 188ac02e2fb6cc6437b776f8c5b69a508728fbdb (diff) | |
| download | Qt-a08b3f5336e5c819b33d922d3a809b5203d728f3.zip Qt-a08b3f5336e5c819b33d922d3a809b5203d728f3.tar.gz Qt-a08b3f5336e5c819b33d922d3a809b5203d728f3.tar.bz2 | |
Merge commit 'qt/master-stable'
Conflicts:
demos/demos.pro
src/gui/graphicsview/qgraphicsitem_p.h
Diffstat (limited to 'util')
| -rwxr-xr-x | util/webkit/mkdist-webkit | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/util/webkit/mkdist-webkit b/util/webkit/mkdist-webkit index a843c83..f4b36d0 100755 --- a/util/webkit/mkdist-webkit +++ b/util/webkit/mkdist-webkit @@ -47,6 +47,7 @@ excluded_directories="$excluded_directories JavaScriptCore/wtf/gtk" excluded_directories="$excluded_directories JavaScriptCore/wtf/mac" excluded_directories="$excluded_directories JavaScriptCore/wtf/win" excluded_directories="$excluded_directories JavaScriptCore/wtf/chromium" +excluded_directories="$excluded_directories JavaScriptCore/wtf/haiku" excluded_directories="$excluded_directories WebCore/WebCore.vcproj" excluded_directories="$excluded_directories WebCore/DerivedSources.make" @@ -68,21 +69,28 @@ excluded_directories="$excluded_directories WebCore/icu" excluded_directories="$excluded_directories WebCore/loader/mac" excluded_directories="$excluded_directories WebCore/loader/win" +excluded_directories="$excluded_directories WebCore/loader/icon/wince" excluded_directories="$excluded_directories WebCore/page/gtk" excluded_directories="$excluded_directories WebCore/page/mac" excluded_directories="$excluded_directories WebCore/page/wx" excluded_directories="$excluded_directories WebCore/page/chromium" +excluded_directories="$excluded_directories WebCore/page/haiku" excluded_directories="$excluded_directories WebCore/history/mac" excluded_directories="$excluded_directories WebCore/editing/mac" excluded_directories="$excluded_directories WebCore/editing/wx" +excluded_directories="$excluded_directories WebCore/editing/haiku" + +excluded_directories="$excluded_directories WebCore/platform/haiku" excluded_directories="$excluded_directories WebCore/platform/text/wx" excluded_directories="$excluded_directories WebCore/platform/text/gtk" excluded_directories="$excluded_directories WebCore/platform/text/chromium" +excluded_directories="$excluded_directories WebCore/platform/text/haiku" +excluded_directories="$excluded_directories WebCore/platform/sql/chromium" excluded_directories="$excluded_directories WebCore/manual-tests" @@ -101,6 +109,7 @@ excluded_directories="$excluded_directories WebCore/platform/graphics/mac" excluded_directories="$excluded_directories WebCore/platform/graphics/win" excluded_directories="$excluded_directories WebCore/platform/graphics/skia" excluded_directories="$excluded_directories WebCore/platform/graphics/chromium" +excluded_directories="$excluded_directories WebCore/platform/graphics/wince" excluded_directories="$excluded_directories WebCore/platform/image-decoders/bmp" excluded_directories="$excluded_directories WebCore/platform/image-decoders/gif" @@ -110,6 +119,7 @@ excluded_directories="$excluded_directories WebCore/platform/image-decoders/ico" excluded_directories="$excluded_directories WebCore/platform/image-decoders/jpeg" excluded_directories="$excluded_directories WebCore/platform/image-decoders/xbm" excluded_directories="$excluded_directories WebCore/platform/image-decoders/skia" +excluded_directories="$excluded_directories WebCore/platform/image-decoders/haiku" excluded_directories="$excluded_directories WebCore/platform/image-encoders/skia" @@ -122,12 +132,16 @@ excluded_directories="$excluded_directories WebCore/accessibility/mac" excluded_directories="$excluded_directories WebCore/accessibility/win" excluded_directories="$excluded_directories WebCore/accessibility/wx" +excluded_directories="$excluded_directories WebCore/storage/wince" +excluded_directories="$excluded_directories WebCore/svg/graphics/wince" + excluded_directories="$excluded_directories WebCore/platform/wx" excluded_directories="$excluded_directories WebKit/gtk" excluded_directories="$excluded_directories WebKit/win" excluded_directories="$excluded_directories WebKit/mac" excluded_directories="$excluded_directories WebKit/wx" excluded_directories="$excluded_directories WebKit/cf" +excluded_directories="$excluded_directories WebKit/haiku" excluded_directories="$excluded_directories WebKit/English.lproj WebKit/WebKit.xcodeproj" excluded_directories="$excluded_directories WebCore/English.lproj" @@ -147,8 +161,6 @@ files_to_remove="$files_to_remove configure.ac" files_to_remove="$files_to_remove WebKit.pro" -files_to_remove="$files_to_remove JavaScriptCore/jsc.pro" - files_to_remove="$files_to_remove WebKit/qt/QtLauncher/QtLauncher.pro" files_to_remove="$files_to_remove WebKit/qt/QtLauncher/main.cpp" |