feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote branch 'origin/1.3'

Browse Source 
Conflicts:
	src/plugins/bineditor/bineditorplugin.cpp
	src/plugins/coreplugin/editormanager/editormanager.cpp
	src/plugins/debugger/gdb/gdbengine.cpp
	src/plugins/debugger/watchhandler.cpp
This commit is contained in:
con
2010-01-14 18:45:35 +01:00
parent 00142e4cf4 cd8bc8a207
commit 24d592d8fa
13 changed files with 86 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/debugger/gdb/gdbengine.cpp
View File

@@ -4664,7 +4664,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.0";
qtBuildPath = "/var/tmp/qt-x11-src-4.6.1";
postCommand("set substitute-path " + qtBuildPath + ' ' + qtInstallPath);
#endif
}