Debugger: Fix interrupting code.

- Windows: Always use DebugBreakProcess if Qt Creator is compiled
  64bit. Else always use win64interrupt.exe if Qt Creator
  is a WOW64 application.
- Remove redundant code (procinterrupt/hostutils, gdb adapters).
- Give interruptProcess an errorMessage parameter such that it can
  be used by all C++ engines and a proper error is displayed.
- Improve error messages.
- Build win64interrupt if target architecture is 64 bit (clean tools
  profile, add a profile), borrowing the check from
  qtcreatorcdbext.pro.

Change-Id: I2a6caf98e46051c49c84e1f3aac4c8d2aba66e8b
Reviewed-by: David Schulz <david.schulz@nokia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>

1 files changed, 14 insertions, 5 deletions

diff --git a/src/tools/tools.pro b/src/tools/tools.pro
index c729495e18..bd5bac6c8f 100644
--- a/src/tools/tools.pro
+++ b/src/tools/tools.pro
@@ -1,11 +1,20 @@
 TEMPLATE = subdirs
 
-win32:SUBDIRS = qtcdebugger
-SUBDIRS += qtpromaker \
-    qmlprofilertool
-SUBDIRS += qmlpuppet
+SUBDIRS = qtpromaker \
+    qmlprofilertool \
+     qmlpuppet
 
-!win32 {
+win32 {
+    SUBDIRS += qtcdebugger
+    # win64interrupt only make sense for 64bit builds
+    ENV_CPU=$$(CPU)
+    ENV_LIBPATH=$$(LIBPATH)
+    contains(ENV_CPU, ^AMD64$) {
+        SUBDIRS += win64interrupt
+    } else:isEmpty(ENV_CPU):contains(ENV_LIBPATH, ^.*amd64.*$) {
+        SUBDIRS += win64interrupt
+    }
+} else {
     SUBDIRS += valgrindfake
 }