Import QtWebKit commit 423e60d5ea622069917a51229a090eae955072dc

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

3 files changed, 12 insertions, 5 deletions

diff --git a/Tools/Scripts/build-webkit b/Tools/Scripts/build-webkit
index b8a4bd1e2..fbaee1c0d 100755
--- a/Tools/Scripts/build-webkit
+++ b/Tools/Scripts/build-webkit
@@ -240,10 +240,6 @@ if (isInspectorFrontend()) {
 }
 
 if (isCMakeBuild() && (!isAnyWindows() || isQt())) {
-    if ($shouldInstall) {
-        $makeArgs .= ($makeArgs ? " " : "") . "install";
-    }
-
     # Visual Studio generator doesn't support -j switch
     if (canUseNinja() || !isAnyWindows()) {
         # By default we build using all of the available CPUs.
@@ -258,6 +254,10 @@ if (isCMakeBuild() && (!isAnyWindows() || isQt())) {
     removeCMakeCache(@featureArgs);
 
     buildCMakeProjectOrExit($clean, $prefixPath, $makeArgs, (cmakeBasedPortArguments(), @featureArgs), $cmakeArgs);
+
+    if ($shouldInstall) {
+        installCMakeProjectOrExit();
+    }
 }
 
 my $baseProductDir = baseProductDir();
diff --git a/Tools/Scripts/webkitdirs.pm b/Tools/Scripts/webkitdirs.pm
index 84b18c7b6..afe4af015 100755
--- a/Tools/Scripts/webkitdirs.pm
+++ b/Tools/Scripts/webkitdirs.pm
@@ -2145,6 +2145,13 @@ sub buildCMakeProjectOrExit($$$@)
     return 0;
 }
 
+sub installCMakeProjectOrExit
+{
+    my $returnCode = exitStatus(system(qw(cmake -P cmake_install.cmake)));
+    exit($returnCode) if $returnCode;
+    return 0;
+}
+
 sub cmakeBasedPortArguments()
 {
     return ();
diff --git a/Tools/qt/make-snapshot.pl b/Tools/qt/make-snapshot.pl
index 2c2af1a9f..8b189059c 100755
--- a/Tools/qt/make-snapshot.pl
+++ b/Tools/qt/make-snapshot.pl
@@ -53,7 +53,7 @@ my @commands = (
     "tar -xf $src_repo/snapshot.tar --strip-components=1",
     "git add -A",
     "rm $src_repo/snapshot.tar",
-    "git commit -m 'Import WebKit commit $commit'"
+    "git commit -m 'Import QtWebKit commit $commit'"
 );
 
 my $cmd = join " && ", @commands;