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/projectexplorer/outputwindow.cpp
This commit is contained in:
con
2009-12-14 11:47:39 +01:00
parent bad8a15f3b 8f586cedcd
commit 7081a3d415
10 changed files with 220 additions and 473 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/projectexplorer/debugginghelper.cpp
View File

@@ -242,10 +242,6 @@ QString DebuggingHelperLibrary::buildDebuggingHelperLibrary(const QString &direc
QString DebuggingHelperLibrary::qtVersionForQMake(const QString &qmakePath)
{
QString binary = qmakePath.mid(qmakePath.lastIndexOf('/')+1);
if (!possibleQMakeCommands().contains(binary))
return QString();
QProcess qmake;
qmake.start(qmakePath, QStringList(QLatin1String("--version")));
if (!qmake.waitForFinished())