diff --git a/src/plugins/debugger/debuggermanager.h b/src/plugins/debugger/debuggermanager.h
index 5e78170a1ecd8ca4df32d1ee8d8bf56d9131fb1a..05639618b2e6a41eba0d71a3fdf9300431eea99a 100644
--- a/src/plugins/debugger/debuggermanager.h
+++ b/src/plugins/debugger/debuggermanager.h
@@ -118,6 +118,7 @@ public:
     QString symbolFileName;
     QString serverStartScript;
     int toolChainType;
+    QString qtInstallPath;
 
     QString dumperLibrary;
     QStringList dumperLibraryLocations;
diff --git a/src/plugins/debugger/debuggerrunner.cpp b/src/plugins/debugger/debuggerrunner.cpp
index 17e11a1e0958246a5ccaebc00f287bc050345073..64b9f310f8744eb90a4c86b15f23ad698d8c42ef 100644
--- a/src/plugins/debugger/debuggerrunner.cpp
+++ b/src/plugins/debugger/debuggerrunner.cpp
@@ -31,6 +31,7 @@
 
 #include "debuggermanager.h"
 
+#include <projectexplorer/debugginghelper.h>
 #include <projectexplorer/environment.h>
 #include <projectexplorer/project.h>
 #include <projectexplorer/projectexplorerconstants.h>
@@ -170,6 +171,21 @@ DebuggerRunControl::DebuggerRunControl(DebuggerManager *manager,
         runConfiguration->dumperLibrary();
     m_startParameters->dumperLibraryLocations =
         runConfiguration->dumperLibraryLocations();
+
+    QString qmakePath = ProjectExplorer::DebuggingHelperLibrary::findSystemQt(
+            runConfiguration->environment());
+    if (!qmakePath.isEmpty()) {
+        QProcess proc;
+        QStringList args;
+        args.append(QLatin1String("-query"));
+        args.append(QLatin1String("QT_INSTALL_HEADERS"));
+        proc.start(qmakePath, args);
+        proc.waitForFinished();
+        QByteArray ba = proc.readAllStandardOutput().trimmed();
+        QFileInfo fi(QString::fromLocal8Bit(ba) + "/..");
+        m_startParameters->qtInstallPath = fi.absoluteFilePath();
+    }
+
 }
 
 void DebuggerRunControl::start()
diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp
index 4a7f5e9fac763e5c08837c81218f21096ddf6c39..11e0860b11cede5e009999727fbeb1883d6cf6ac 100644
--- a/src/plugins/debugger/gdb/gdbengine.cpp
+++ b/src/plugins/debugger/gdb/gdbengine.cpp
@@ -4427,6 +4427,21 @@ void GdbEngine::handleAdapterStarted()
 
 void GdbEngine::handleInferiorPrepared()
 {
+    const QString qtInstallPath = m_startParameters->qtInstallPath;
+    if (!qtInstallPath.isEmpty()) {
+        QString qtBuildPath =
+        #if defined(Q_OS_WIN)
+            _("C:/qt-greenhouse/Trolltech/Code_less_create_more/Trolltech/Code_less_create_more/Troll/4.6/qt");
+        #elif defined(Q_OS_MAC)
+            QString();
+        #else    
+            _("/var/tmp/qt-x11-src-4.6.0");
+        #endif
+        if (!qtBuildPath.isEmpty())
+        postCommand(_("set substitute-path %1 %2")
+            .arg(qtBuildPath).arg(qtInstallPath));
+    }
+
     // Initial attempt to set breakpoints
     showStatusMessage(tr("Setting breakpoints..."));
     attemptBreakpointSynchronization();