diff options
author | Tobias Hunger <tobias.hunger@nokia.com> | 2010-04-13 12:07:13 +0200 |
---|---|---|
committer | con <qtc-committer@nokia.com> | 2010-04-13 17:23:05 +0200 |
commit | d9ccf5abec76778a98b4632c18545bccd6374b19 (patch) | |
tree | d033051c4dff2244aea993ebcdd5d00d55f55561 | |
parent | 8ea6cb328578c20204998840b4ecd68d0e29f247 (diff) | |
download | qt-creator-d9ccf5abec76778a98b4632c18545bccd6374b19.tar.gz |
Fix possible crash in targetsetuppage
* Fix a possible memleak while at it.
TaskNumber: QTCREATORBUG-1125
Reviewed-by: dt
(cherry picked from commit e6f43cbbe515f972dc1912f7594f7a988ee78deb)
-rw-r--r-- | src/plugins/qt4projectmanager/wizards/targetsetuppage.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/plugins/qt4projectmanager/wizards/targetsetuppage.cpp b/src/plugins/qt4projectmanager/wizards/targetsetuppage.cpp index b7b323d18b..573f7c7166 100644 --- a/src/plugins/qt4projectmanager/wizards/targetsetuppage.cpp +++ b/src/plugins/qt4projectmanager/wizards/targetsetuppage.cpp @@ -104,8 +104,11 @@ void TargetSetupPage::setImportInfos(const QList<ImportInfo> &infos) break; } } - if (skip) + if (skip) { + if (i.isTemporary) + delete i.version; continue; + } m_infos.append(i); @@ -380,6 +383,7 @@ void TargetSetupPage::importDirectoryAdded(const QString &directory) return; m_directoryChooser->setPath(QString()); QList<ImportInfo> tmp = m_infos; + m_infos.clear(); // Clear m_infos without deleting temporary QtVersions! tmp.append(recursivelyCheckDirectoryForBuild(directory)); setImportInfos(tmp); } |