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

Fix last commit

Browse Source
This commit is contained in:
dt
2011-01-17 15:54:49 +01:00
parent 199361834b
commit 6422b1193f
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1526,7 +1526,7 @@ QString QtVersion::resolveLink(const QString &path) const
f.setFile(f.symLinkTarget()); f.setFile(f.symLinkTarget());
if (links <= 0) if (links <= 0)
return QString(); return QString();
return f.path(); return f.filePath();
} }
QString QtVersion::mwcDirectory() const QString QtVersion::mwcDirectory() const
@@ -1626,7 +1626,7 @@ bool QtVersion::isValid() const
&& !displayName().isEmpty() && !displayName().isEmpty()
&& !m_notInstalled && !m_notInstalled
&& m_versionInfo.contains("QT_INSTALL_BINS") && m_versionInfo.contains("QT_INSTALL_BINS")
&& !m_mkspecFullPath.isEmpty(); && (!m_mkspecFullPath.isEmpty() || !m_toolChainUpToDate);
} }
QString QtVersion::invalidReason() const QString QtVersion::invalidReason() const
@@ -1642,7 +1642,7 @@ QString QtVersion::invalidReason() const
if (!m_versionInfo.contains("QT_INSTALL_BINS")) if (!m_versionInfo.contains("QT_INSTALL_BINS"))
return QCoreApplication::translate("QtVersion", return QCoreApplication::translate("QtVersion",
"Could not determine the path to the binaries of the Qt installation, maybe the qmake path is wrong?"); "Could not determine the path to the binaries of the Qt installation, maybe the qmake path is wrong?");
if (m_mkspecFullPath.isEmpty()) if (m_toolChainUpToDate && m_mkspecFullPath.isEmpty())
return QCoreApplication::translate("QtVersion", "The default mkspec symlink is broken."); return QCoreApplication::translate("QtVersion", "The default mkspec symlink is broken.");
return QString(); return QString();
} }