1 files changed, 16 insertions, 3 deletions
diff --git a/Tools/qmake/projects/run_cmake.pro b/Tools/qmake/projects/run_cmake.pro
index e0c615b0a..ac8767154 100644
--- a/Tools/qmake/projects/run_cmake.pro
+++ b/Tools/qmake/projects/run_cmake.pro
@@ -4,6 +4,8 @@ ROOT_QT_BUILD_DIR = $$ROOT_BUILD_DIR/..
 
 TEMPLATE = aux
 
+qtConfig(debug_and_release): CONFIG += debug_and_release build_all
+
 msvc:!contains(QMAKE_HOST.arch, x86_64) {
     debug_and_release {
         warning("Skipping debug build of QtWebKit because it requires a 64-bit toolchain")
@@ -76,10 +78,13 @@ build_pass|!debug_and_release {
     equals(QMAKE_HOST.os, Windows) {
         if(equals(MAKEFILE_GENERATOR, MSVC.NET)|equals(MAKEFILE_GENERATOR, MSBUILD)) {
             cmake_generator = "NMake Makefiles JOM"
+            make_command_name = jom
         } else: if(equals(MAKEFILE_GENERATOR, MINGW)) {
             cmake_generator = "MinGW Makefiles"
+            make_command_name = make
         } else {
             cmake_generator = "Unix Makefiles"
+            make_command_name = make
         }
         cmake_args += "-G \"$$cmake_generator\""
     }
@@ -98,14 +103,22 @@ build_pass|!debug_and_release {
     log("$${EOL}Running $$cmake_env cmake $$ROOT_WEBKIT_DIR $$cmake_args $${EOL}$${EOL}")
     !system("$$cmake_cmd_base $$cmake_env cmake $$ROOT_WEBKIT_DIR $$cmake_args"): error("Running cmake failed")
 
-    log("$${EOL}WebKit is now configured for building. Just run 'make'.$${EOL}$${EOL}")
+    log("$${EOL}WebKit is now configured for building. Just run '$$make_command_name'.$${EOL}$${EOL}")
 
 
-    default_target.target = first
+    build_pass:build_all: default_target.target = all
+    else: default_target.target = first
     default_target.commands = cd $$cmake_build_dir && $(MAKE) $$make_args
     QMAKE_EXTRA_TARGETS += default_target
 
+    # When debug and release are built at the same time, don't install data files twice
+    debug_and_release:build_all:CONFIG(debug, debug|release): cmake_install_args = "-DCOMPONENT=Code"
+
+    install_impl_target.target = install_impl
+    install_impl_target.commands = cd $$cmake_build_dir && cmake $$cmake_install_args -P cmake_install.cmake
+    QMAKE_EXTRA_TARGETS += install_impl_target
+
     install_target.target = install
-    install_target.commands = cd $$cmake_build_dir && $(MAKE) install $$make_args DESTDIR=$(INSTALL_ROOT)
+    install_target.commands = $(MAKE) -f $(MAKEFILE) install_impl $$make_args DESTDIR=$(INSTALL_ROOT)
     QMAKE_EXTRA_TARGETS += install_target
 }