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/cpptools/cppcodecompletion.cpp
	src/plugins/help/helpplugin.cpp
	src/plugins/projectexplorer/projectexplorer.cpp
This commit is contained in:
Oswald Buddenhagen
2009-11-20 17:25:39 +01:00
parent 43cca5c41e 2e82c14abc
commit 913f6161a1
30 changed files with 4522 additions and 4941 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4497,17 +4497,19 @@ 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())
QString qtBuildPath;
#if defined(Q_OS_WIN)
qtBuildPath = _("C:/qt-greenhouse/Trolltech/Code_less_create_more/Trolltech/Code_less_create_more/Troll/4.6/qt");
postCommand(_("set substitute-path %1 %2")
.arg(qtBuildPath).arg(qtInstallPath));
.arg(qtBuildPath).arg(qtInstallPath));
qtBuildPath = _("C:/iwmake/build_mingw_opensource");
postCommand(_("set substitute-path %1 %2")
.arg(qtBuildPath).arg(qtInstallPath));
#elif defined(Q_OS_UNIX) && !defined (Q_OS_MAC)
qtBuildPath = _("/var/tmp/qt-x11-src-4.6.0");
postCommand(_("set substitute-path %1 %2")
.arg(qtBuildPath).arg(qtInstallPath));
#endif
}
// Initial attempt to set breakpoints