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

Also detect QtCore when located next to qmake

Browse Source
This commit is contained in:
Tobias Hunger
2011-03-02 12:25:22 +01:00
parent 35847fda82
commit 586d1440be
1 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1587,8 +1587,10 @@ QString QtVersion::resolveLink(const QString &path) const
QString QtVersion::qtCorePath() const QString QtVersion::qtCorePath() const
{ {
QDir libDir(libraryInstallPath()); QList<QDir> dirs;
QFileInfoList infoList = libDir.entryInfoList(); dirs << QDir(libraryInstallPath()) << QDir(versionInfo().value(QLatin1String("QT_INSTALL_BINS")));
foreach (const QDir &d, dirs) {
QFileInfoList infoList = d.entryInfoList();
foreach (const QFileInfo &info, infoList) { foreach (const QFileInfo &info, infoList) {
const QString file = info.fileName(); const QString file = info.fileName();
if (info.isDir() if (info.isDir()
@@ -1596,16 +1598,18 @@ QString QtVersion::qtCorePath() const
&& file.endsWith(QLatin1String(".framework"))) { && file.endsWith(QLatin1String(".framework"))) {
// handle Framework // handle Framework
const QString libName = file.left(file.lastIndexOf('.')); const QString libName = file.left(file.lastIndexOf('.'));
return libDir.absoluteFilePath(file + '/' + libName); return info.absoluteFilePath() + '/' + libName;
} }
if (info.isReadable() if (info.isReadable()
&& (file.startsWith(QLatin1String("libQtCore")) && (file.startsWith(QLatin1String("libQtCore"))
|| file.startsWith(QLatin1String("QtCore"))) || file.startsWith(QLatin1String("QtCore")))
&& (file.endsWith(QLatin1String(".dll")) && (file.endsWith(QLatin1String(".dll"))
|| file.endsWith(QString::fromLatin1(".so.") + qtVersionString()))) { || file.endsWith(QString::fromLatin1(".so.") + qtVersionString())
|| file.endsWith(".la"))) {
return info.absoluteFilePath(); return info.absoluteFilePath();
} }
} }
}
return QString(); return QString();
} }