Merge branch '1.3'

Conflicts:
	src/plugins/debugger/gdb/gdbengine.cpp
This commit is contained in:
Thorbjørn Lindeijer
2010-02-04 15:09:05 +01:00
6 changed files with 12 additions and 12 deletions

View File

@@ -3975,7 +3975,7 @@ void GdbEngine::handleInferiorPrepared()
qtBuildPath = "C:/iwmake/build_mingw_opensource";
postCommand("set substitute-path " + qtBuildPath + ' ' + qtInstallPath);
#elif defined(Q_OS_UNIX) && !defined (Q_OS_MAC)
qtBuildPath = "/var/tmp/qt-x11-src-4.6.1";
qtBuildPath = "/var/tmp/qt-src";
postCommand("set substitute-path " + qtBuildPath + ' ' + qtInstallPath);
#endif
}