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

Do not register the same Qt version under several names

Browse Source 
Do not get fooled by the same qmake being available (via
symlinks) in several places on the file system. Just register
each Qt version once.

Change-Id: I8d5efb80599a697c32a3ca3ab37924bc9ab523eb
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
This commit is contained in:
Tobias Hunger
2012-09-24 15:25:31 +02:00
parent f8810811c3
commit 778e6675e1
2 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/plugins/qtsupport/qtoptionspage.cpp
View File

@@ -635,19 +635,24 @@ static QString filterForQmakeFileDialog()
void QtOptionsPageWidget::addQtDir()
{
Utils::FileName qtVersion = Utils::FileName::fromString(
QFileDialog::getOpenFileName(this,
tr("Select a qmake executable"),
QString(),
filterForQmakeFileDialog(),
0,
QFileDialog::DontResolveSymlinks));
QFileInfo(QFileDialog::getOpenFileName(this,
tr("Select a qmake executable"),
QString(),
filterForQmakeFileDialog(),
0,
QFileDialog::DontResolveSymlinks)).canonicalFilePath());
if (qtVersion.isNull())
return;
if (QtVersionManager::instance()->qtVersionForQMakeBinary(qtVersion)) {
BaseQtVersion *version = QtVersionManager::instance()->qtVersionForQMakeBinary(qtVersion);
if (version) {
// Already exist
QMessageBox::warning(this, tr("Qt known"),
tr("This Qt version was already registered as \"%1\".")
.arg(version->displayName()));
return;
}
BaseQtVersion *version = QtVersionFactory::createQtVersionFromQMakePath(qtVersion);
version = QtVersionFactory::createQtVersionFromQMakePath(qtVersion);
if (version) {
m_versions.append(version);

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

@@ -623,9 +623,8 @@ Utils::FileName QtVersionManager::findQMakeBinaryFromMakefile(const QString &mak
#endif
// Is qmake still installed?
QFileInfo fi(qmakePath);
if (fi.exists()) {
return Utils::FileName(fi);
}
if (fi.exists())
return Utils::FileName::fromString(fi.canonicalFilePath());
}
}
}