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

Revert "Debugger: Improve the helper build mechanism on the settings page."

Browse Source 
This reverts commit debb3961c2.
Success cannot be properly detected.
This commit is contained in:
Friedemann Kleint
2009-08-07 14:20:27 +02:00
parent debb3961c2
commit 2841e875b4
6 changed files with 202 additions and 344 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/qt4projectmanager/qtversionmanager.cpp
View File

@@ -1266,10 +1266,8 @@ QString QtVersion::buildDebuggingHelperLibrary()
// TODO: the debugging helper doesn't comply to actual tool chain yet
ProjectExplorer::ToolChain *tc = createToolChain(defaultToolchainType());
tc->addToEnvironment(env);
QString output;
QString directory = DebuggingHelperLibrary::copyDebuggingHelperLibrary(qtInstallData, path(), &output);
if (!directory.isEmpty())
output += DebuggingHelperLibrary::buildDebuggingHelperLibrary(directory, tc->makeCommand(), qmakeCommand(), mkspec(), env);
QString directory = DebuggingHelperLibrary::copyDebuggingHelperLibrary(qtInstallData, path());
QString output = DebuggingHelperLibrary::buildDebuggingHelperLibrary(directory, tc->makeCommand(), qmakeCommand(), mkspec(), env);
m_hasDebuggingHelper = !debuggingHelperLibrary().isEmpty();
delete tc;
return output;