move qtcbuildhelper where it belongs and rename it accordingly

this is not a creator tool, but a helper of qtcprocess, just like the
existing stub.

Change-Id: Ice7c60a1dee0b132c6063747f82ea35699f4127d
Reviewed-on: http://codereview.qt.nokia.com/2918
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>

6 files changed, 23 insertions, 16 deletions

diff --git a/src/libs/libs.pro b/src/libs/libs.pro
index 658fc3fe99..3ced44952b 100644
--- a/src/libs/libs.pro
+++ b/src/libs/libs.pro
@@ -17,6 +17,7 @@ SUBDIRS   = \
     glsl \
     qmleditorwidgets \
     qtcomponents/styleitem
+win32:SUBDIRS += utils/process_ctrlc_stub.pro
 
 # Windows: Compile Qt Creator CDB extension if Debugging tools can be detected.    
 win32 {
diff --git a/src/tools/qtcbuildhelper/main.cpp b/src/libs/utils/process_ctrlc_stub.cpp
index b7e29fd4ba..b7e29fd4ba 100644
--- a/src/tools/qtcbuildhelper/main.cpp
+++ b/src/libs/utils/process_ctrlc_stub.cpp
diff --git a/src/libs/utils/process_ctrlc_stub.pro b/src/libs/utils/process_ctrlc_stub.pro
new file mode 100644
index 0000000000..9dcff34568
--- /dev/null
+++ b/src/libs/utils/process_ctrlc_stub.pro
@@ -0,0 +1,21 @@
+!win32: error("process_ctrlc_stub is Windows only")
+
+include(../../../qtcreator.pri)
+
+TEMPLATE  = app
+TARGET    = qtcreator_ctrlc_stub
+DESTDIR   = $$IDE_LIBEXEC_PATH
+
+QT        =
+CONFIG    += console warn_on
+
+SOURCES   += process_ctrlc_stub.cpp
+LIBS      += -luser32 -lshell32
+
+build_all:!build_pass {
+    CONFIG -= build_all
+    CONFIG += release
+}
+
+target.path  = /bin # FIXME: libexec, more or less
+INSTALLS    += target
diff --git a/src/libs/utils/qtcprocess.cpp b/src/libs/utils/qtcprocess.cpp
index 2e05b9e111..2627b98046 100644
--- a/src/libs/utils/qtcprocess.cpp
+++ b/src/libs/utils/qtcprocess.cpp
@@ -671,7 +671,7 @@ void QtcProcess::start()
     setNativeArguments(arguments);
     if (m_useCtrlCStub) {
         argList << command;
-        command = QCoreApplication::applicationDirPath() + QLatin1String("/qtcbuildhelper.exe"));
+        command = QCoreApplication::applicationDirPath() + QLatin1String("/qtcreator_ctrlc_stub.exe"));
     }
     QProcess::start(command, argList);
 #else
diff --git a/src/tools/qtcbuildhelper/qtcbuildhelper.pro b/src/tools/qtcbuildhelper/qtcbuildhelper.pro
deleted file mode 100644
index 6fa231c011..0000000000
--- a/src/tools/qtcbuildhelper/qtcbuildhelper.pro
+++ /dev/null
@@ -1,14 +0,0 @@
-!win32: error("qtcbuildhelper is Windows only")
-
-include(../../../qtcreator.pri)
-
-TEMPLATE  = app
-TARGET    = qtcbuildhelper
-DESTDIR   = $$IDE_BIN_PATH
-
-QT        -= qt core gui
-CONFIG    += console warn_on
-
-SOURCES   += main.cpp
-LIBS      += -luser32 -lshell32
-
diff --git a/src/tools/tools.pro b/src/tools/tools.pro
index 45077795d8..f2e6b0f0b6 100644
--- a/src/tools/tools.pro
+++ b/src/tools/tools.pro
@@ -1,7 +1,6 @@
 TEMPLATE = subdirs
 
 win32:SUBDIRS = qtcdebugger
-win32:SUBDIRS += qtcbuildhelper
 SUBDIRS += qtpromaker
 SUBDIRS += qmlpuppet