diff options
| author | axis <qt-info@nokia.com> | 2011-03-10 10:01:49 +0100 |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2011-03-10 10:01:49 +0100 |
| commit | 7bc2f92cb5db8451643102dced977e50d114373c (patch) | |
| tree | b2570f294fbfe05771f13bda04d5f1523821b983 /scripts | |
| parent | 6da8e1e5c0e415578bf945bc4c57e99a4a947280 (diff) | |
Moved qtwebkit patches to the mother repository.
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/910_qtwebkit_patches | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/910_qtwebkit_patches b/scripts/910_qtwebkit_patches index f852dd2..63dd467 100644 --- a/scripts/910_qtwebkit_patches +++ b/scripts/910_qtwebkit_patches @@ -18,15 +18,15 @@ #-------------------------------------------------------------------------------------------------- chdir("qt/qtwebkit"); -my @patches = findFiles("$basepath/patches/qtwebkit", '^\d+-.*\.patch', 0); -my @patchesForTrunk = findFiles("$basepath/patches/qtwebkit/webkit", '^\d+-.*\.patch', 0); +my @patches = findFiles("$basepath/mother/patches/qtwebkit", '^\d+-.*\.patch', 0); +my @patchesForTrunk = findFiles("$basepath/mother/patches/qtwebkit/webkit", '^\d+-.*\.patch', 0); my @patchesToApply; foreach (@patchesForTrunk) { $inPatchesForTrunk{$_} = 1; } foreach my $patch (@patches) { if ($qtWebKitType =~ /^webkit$/ && $inPatchesForTrunk{$patch}) { - push(@patchesToApply, "$basepath/patches/qtwebkit/webkit/$patch"); + push(@patchesToApply, "$basepath/mother/patches/qtwebkit/webkit/$patch"); } else { - push(@patchesToApply, "$basepath/patches/qtwebkit/$patch"); + push(@patchesToApply, "$basepath/mother/patches/qtwebkit/$patch"); } } run("git am --ignore-whitespace " . join(" ", @patchesToApply)); |