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

Properly detect Qt versions of directories

Browse Source 
* Detection of Qt versions from a makefile failed on windows
   when calling qmake without the drive letter. Make this work.
This commit is contained in:
Tobias Hunger
2010-08-24 18:10:08 +02:00
parent 4fc6393ff2
commit f3f6d642e5
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -807,16 +807,20 @@ QString QtVersionManager::findQMakeBinaryFromMakefile(const QString &directory)
QFileInfo qmake(r1.cap(1).trimmed()); QFileInfo qmake(r1.cap(1).trimmed());
QString qmakePath = qmake.filePath(); QString qmakePath = qmake.filePath();
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
qmakePath = qmakePath.toLower();
if (!qmakePath.endsWith(QLatin1String(".exe"))) if (!qmakePath.endsWith(QLatin1String(".exe")))
qmakePath.append(QLatin1String(".exe")); qmakePath.append(QLatin1String(".exe"));
#endif #endif
// Is qmake still installed? // Is qmake still installed?
if (QFile::exists(qmakePath)) QFileInfo fi(qmakePath);
if (fi.exists()) {
qmakePath = fi.absoluteFilePath();
#ifdef Q_OS_WIN
qmakePath = qmakePath.toLower();
#endif
return qmakePath; return qmakePath;
} }
} }
makefile.close(); }
} }
return QString(); return QString();
} }