diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2009-08-12 12:02:37 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2009-08-12 12:24:09 (GMT) |
| commit | 573ba5ded65a83e75589152071bac182ca8bcda3 (patch) | |
| tree | 5a2367a26128cd1b3aaff42b074379fd72670328 | |
| parent | 657de489549bab1f9d2ba759739dd55f65a8532e (diff) | |
| download | Qt-573ba5ded65a83e75589152071bac182ca8bcda3.zip Qt-573ba5ded65a83e75589152071bac182ca8bcda3.tar.gz Qt-573ba5ded65a83e75589152071bac182ca8bcda3.tar.bz2 | |
Fix WebKit import from the trunk (part 2)
Fix generation of WebKit version file by including the xcconfig file.
Reviewed-by: Trust me
| -rwxr-xr-x | util/webkit/mkdist-webkit | 28 |
1 files changed, 27 insertions, 1 deletions
diff --git a/util/webkit/mkdist-webkit b/util/webkit/mkdist-webkit index 5550cf8..5c80e73 100755 --- a/util/webkit/mkdist-webkit +++ b/util/webkit/mkdist-webkit @@ -137,7 +137,6 @@ excluded_directories="$excluded_directories WebCore/storage/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" @@ -147,6 +146,33 @@ excluded_directories="$excluded_directories WebCore/English.lproj" exclude_with_exceptions_list="WebCore/platform/win/:WebCore/platform/win/SystemTimeWin.cpp" +excluded_directories="$excluded_directories WebKit/mac/Carbon" +excluded_directories="$excluded_directories WebKit/mac/ChangeLog" +excluded_directories="$excluded_directories WebKit/mac/ChangeLog-2002-12-03" +excluded_directories="$excluded_directories WebKit/mac/ChangeLog-2006-02-09" +excluded_directories="$excluded_directories WebKit/mac/ChangeLog-2007-10-14" +excluded_directories="$excluded_directories WebKit/mac/DefaultDelegates" +excluded_directories="$excluded_directories WebKit/mac/DOM" +excluded_directories="$excluded_directories WebKit/mac/ForwardingHeaders" +excluded_directories="$excluded_directories WebKit/mac/History" +excluded_directories="$excluded_directories WebKit/mac/icu" +excluded_directories="$excluded_directories WebKit/mac/Info.plist" +excluded_directories="$excluded_directories WebKit/mac/MigrateHeaders.make" +excluded_directories="$excluded_directories WebKit/mac/Misc" +excluded_directories="$excluded_directories WebKit/mac/Panels" +excluded_directories="$excluded_directories WebKit/mac/Plugins" +excluded_directories="$excluded_directories WebKit/mac/PublicHeaderChangesFromTiger.txt" +excluded_directories="$excluded_directories WebKit/mac/Resources" +excluded_directories="$excluded_directories WebKit/mac/Storage" +excluded_directories="$excluded_directories WebKit/mac/WebCoreSupport" +excluded_directories="$excluded_directories WebKit/mac/WebInspector" +excluded_directories="$excluded_directories WebKit/mac/WebKit.exp" +excluded_directories="$excluded_directories WebKit/mac/WebKit.order" +excluded_directories="$excluded_directories WebKit/mac/WebKitPrefix.h" +excluded_directories="$excluded_directories WebKit/mac/WebView" + +exclude_with_exceptions_list="$exclude_with_exceptions_list WebKit/mac/Configurations/:WebKit/mac/Configurations/Version.xcconfig" + files_to_remove="" files_to_remove="$files_to_remove WebKit/qt/Api/qwebnetworkinterface.cpp" files_to_remove="$files_to_remove WebKit/qt/Api/qwebnetworkinterface.h" |