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

Return <default> if we can't find out the mkspec name. Overwrite mkspec

Browse Source 
in case one has set MAKESPEC but does not actually pass it as argument.

Reviewed-by: dt
This commit is contained in:
kh1
2009-10-26 15:57:30 +01:00
parent 11706165a2
commit efa44fa5c1
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -934,7 +934,7 @@ void QtVersion::updateMkSpec() const
return;
//qDebug()<<"Finding mkspec for"<<path();
QString mkspec;
QString mkspec = "default";
// no .qmake.cache so look at the default mkspec
m_mkspecFullPath = versionInfo().value("QMAKE_MKSPECS");
if (m_mkspecFullPath.isEmpty())
@@ -1228,7 +1228,8 @@ int QtVersion::getUniqueId()
bool QtVersion::isValid() const
{
return (!(m_id == -1 || m_qmakeCommand == QString::null || m_name == QString::null || mkspec() == QString::null) && !m_notInstalled);
return (!(m_id == -1 || m_qmakeCommand == QString::null
|| m_name == QString::null) && !m_notInstalled);
}
QtVersion::QmakeBuildConfig QtVersion::defaultBuildConfig() const