summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJocelyn Turcotte <jocelyn.turcotte@nokia.com>2009-10-05 10:14:08 (GMT)
committerJason McDonald <jason.mcdonald@nokia.com>2009-10-05 11:17:30 (GMT)
commit9815de3fbdbca8bda881e939274b3133492933fb (patch)
treed5d552ce46823bbf03bd4dc0d67b2873ef1226c1
parentb50966121c3de0328f810b176e549b63985d974a (diff)
downloadQt-9815de3fbdbca8bda881e939274b3133492933fb.zip
Qt-9815de3fbdbca8bda881e939274b3133492933fb.tar.gz
Qt-9815de3fbdbca8bda881e939274b3133492933fb.tar.bz2
Exclude WebCore/jsc.pro and WebKit/qt/Plugins/ from 3rdparty/webkit
Rubber-stamped by: Simon Hausmann (cherry picked from commit 5286a0211d9c76bf762c8041c1d596d8c9c9c08d)
-rwxr-xr-xutil/webkit/mkdist-javascriptcore1
-rwxr-xr-xutil/webkit/mkdist-webkit3
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"