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

Wrong path comparision making resulting in unecessary qmake runs

Browse Source
This commit is contained in:
dt
2009-08-27 15:08:47 +02:00
parent 8bc81f4395
commit 3aec72c4e1
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -474,6 +474,9 @@ void QtVersion::setName(const QString &name)
void QtVersion::setPath(const QString &path) void QtVersion::setPath(const QString &path)
{ {
m_path = QDir::cleanPath(path); m_path = QDir::cleanPath(path);
#ifdef Q_OS_WIN
m_path = m_path.toLower();
#endif
updateSourcePath(); updateSourcePath();
m_versionInfoUpToDate = false; m_versionInfoUpToDate = false;
m_mkspecUpToDate = false; m_mkspecUpToDate = false;
@@ -525,6 +528,9 @@ QString QtVersionManager::findQtVersionFromMakefile(const QString &directory)
QFileInfo qmake(r1.cap(1).trimmed()); QFileInfo qmake(r1.cap(1).trimmed());
QFileInfo binDir(qmake.absolutePath()); QFileInfo binDir(qmake.absolutePath());
QString qtDir = binDir.absolutePath(); QString qtDir = binDir.absolutePath();
#ifdef Q_OS_WIN
qtDir = qtDir.toLower();
#endif
if (debugAdding) if (debugAdding)
qDebug() << "#~~ QtDir:"<<qtDir; qDebug() << "#~~ QtDir:"<<qtDir;
return qtDir; return qtDir;