diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-10-06 22:38:59 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-10-06 22:38:59 (GMT) |
| commit | 101184ea92171c303d240917f34815730a5e9fab (patch) | |
| tree | e265a681a4146f00878cb3a9b6297f6b8b6e0a95 /util | |
| parent | 396a06a52a0f00639c9e528caf80ae2294e80bd2 (diff) | |
| parent | 2d2b4e8a77a30449d8b4ebc88979b3aff45a8222 (diff) | |
| download | Qt-101184ea92171c303d240917f34815730a5e9fab.zip Qt-101184ea92171c303d240917f34815730a5e9fab.tar.gz Qt-101184ea92171c303d240917f34815730a5e9fab.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui
Diffstat (limited to 'util')
| -rwxr-xr-x | util/webkit/mkdist-javascriptcore | 1 | ||||
| -rwxr-xr-x | util/webkit/mkdist-webkit | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/util/webkit/mkdist-javascriptcore b/util/webkit/mkdist-javascriptcore index dc33f6c..07419ea 100755 --- a/util/webkit/mkdist-javascriptcore +++ b/util/webkit/mkdist-javascriptcore @@ -41,6 +41,7 @@ files_to_remove="" files_to_remove="$files_to_remove JavaScriptCore/AllInOneFile.cpp" files_to_remove="$files_to_remove JavaScriptCore/JavaScriptCoreSources.bkl" files_to_remove="$files_to_remove JavaScriptCore/jscore.bkl" +files_to_remove="$files_to_remove JavaScriptCore/jsc.pro" require_clean_work_tree() { # test if working tree is dirty diff --git a/util/webkit/mkdist-webkit b/util/webkit/mkdist-webkit index 34a2ec7..9611d38 100755 --- a/util/webkit/mkdist-webkit +++ b/util/webkit/mkdist-webkit @@ -143,6 +143,8 @@ excluded_directories="$excluded_directories WebCore/storage/wince" excluded_directories="$excluded_directories WebCore/platform/wx" excluded_directories="$excluded_directories WebCore/platform/wince" +excluded_directories="$excluded_directories WebKit/qt/Plugins" + excluded_directories="$excluded_directories WebKit/gtk" excluded_directories="$excluded_directories WebKit/win" excluded_directories="$excluded_directories WebKit/wx" @@ -204,6 +206,7 @@ files_to_remove="$files_to_remove WebKit/qt/QGVLauncher/main.cpp" files_to_remove="$files_to_remove JavaScriptCore/AllInOneFile.cpp" files_to_remove="$files_to_remove JavaScriptCore/JavaScriptCoreSources.bkl" files_to_remove="$files_to_remove JavaScriptCore/jscore.bkl" +files_to_remove="$files_to_remove JavaScriptCore/jsc.pro" files_to_remove="$files_to_remove WebCore/wscript" files_to_remove="$files_to_remove WebCore/WebCore.ContextMenus.exp" |