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

Remove essential dead code setting PYTHONPATH

Browse Source 
The code was changed from #ifdef Q_OS_WIN to
sp.toolChainAbi.osFlavor() == Abi::WindowsMSysFlavor, which means it was
effectively disabled the last 5 months except in very rare cases.
Also Danimo confirms that the code is no longer needed.

Change-Id: Ia99d9d12415757b3d1e329a631cff0d78caf7804
Reviewed-on: http://codereview.qt.nokia.com/2218
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
Daniel Teske
2011-07-26 16:31:00 +02:00
committed by hjk
parent be4d9b946f
commit 7b940d953c
1 changed files with 0 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4577,44 +4577,6 @@ bool GdbEngine::startGdb(const QStringList &args, const QString &settingsIdHint)
gdbArgs << _("-n");
gdbArgs += args;
if (sp.toolChainAbi.osFlavor() == Abi::WindowsMSysFlavor) {
// Set python path. By convention, python is located below gdb executable.
// Extend the environment set on the process in startAdapter().
const QFileInfo fi(m_gdb);
QTC_ASSERT(fi.isAbsolute(), return false; )
const QDir dir = fi.absoluteDir();
QProcessEnvironment environment = gdbProc()->processEnvironment();
const QString pythonPathVariable = _("PYTHONPATH");
QString pythonPath;
const QString environmentPythonPath = environment.value(pythonPathVariable);
if (dir.exists(_("lib"))) {
// Needed for our gdb 7.2 packages.
pythonPath = QDir::toNativeSeparators(dir.absoluteFilePath(_("lib")));
} else {
pythonPath = environmentPythonPath;
}
if (pythonPath.isEmpty()) {
const QString nativeGdb = QDir::toNativeSeparators(m_gdb);
showMessage(_("GDB %1 CANNOT FIND THE PYTHON INSTALLATION.").arg(nativeGdb));
showStatusMessage(_("%1 cannot find python").arg(nativeGdb));
const QString msg = tr("The GDB installed at %1 cannot "
"find a valid python installation in its subdirectories.\n"
"You may set the environment variable PYTHONPATH to point to your installation.")
.arg(nativeGdb);
handleAdapterStartFailed(msg, settingsIdHint);
return false;
}
showMessage(_("Python path: %1").arg(pythonPath), LogMisc);
// Apply to process.
if (pythonPath != environmentPythonPath) {
environment.insert(pythonPathVariable, pythonPath);
gdbProc()->setProcessEnvironment(environment);
}
}
connect(gdbProc(), SIGNAL(error(QProcess::ProcessError)),
SLOT(handleGdbError(QProcess::ProcessError)));
connect(gdbProc(), SIGNAL(finished(int, QProcess::ExitStatus)),