Import QtWebKit commit 980d6f0dc91dd18951d7bd53cea86c898fab5830

Change-Id: I48a0a0286cb73f9f418bdf061930fce7549aa0df
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>

2 files changed, 9 insertions, 1 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 31a2ea1fd..432ae6fce 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,7 +27,7 @@ set(ALL_PORTS
     WinCairo
     Qt
 )
-set(PORT "NOPORT" CACHE STRING "choose which WebKit port to build (one of ${ALL_PORTS})")
+set(PORT "Qt" CACHE STRING "choose which WebKit port to build (one of ${ALL_PORTS})")
 
 list(FIND ALL_PORTS ${PORT} RET)
 if (${RET} EQUAL -1)
diff --git a/Tools/qt/update-wip-qtwebkit-refs b/Tools/qt/update-wip-qtwebkit-refs
index b37f31ddd..d16f22181 100755
--- a/Tools/qt/update-wip-qtwebkit-refs
+++ b/Tools/qt/update-wip-qtwebkit-refs
@@ -34,6 +34,9 @@ defined $commit or usage();
 print "Remote '$remote': ", `git remote get-url $remote`, "\n";
 $? == 0 or die "git exited with code $?";
 
+print "Remote 'qtwebkit': ", `git remote get-url qtwebkit`, "\n";
+$? == 0 or die "git exited with code $?";
+
 print `git --no-pager log --color -n1 --decorate=full $commit`;
 $? == 0 or die "git exited with code $?";
 
@@ -45,3 +48,8 @@ lc $answer eq "y" or die "Got '$answer', exiting";
 print "git push -f $remote $commit:refs/heads/wip/qtwebkit/5.212 && git push -f $remote $commit:refs/staging/wip/qtwebkit/5.212\n";
 `git push -f $remote $commit:refs/heads/wip/qtwebkit/5.212 && git push -f $remote $commit:refs/staging/wip/qtwebkit/5.212`;
 $? == 0 or die "git exited with code $?";
+
+my $qt5TagName = "qtwebkit-5.212-" . time();
+print "git tag -a '$qt5TagName' -m '$qt5TagName' && git push qtwebkit '$qt5TagName'\n";
+`git tag -a '$qt5TagName' -m '$qt5TagName' && git push qtwebkit '$qt5TagName'`;
+$? == 0 or die "git exited with code $?";