diff options
author | hjk <qtc-committer@nokia.com> | 2009-02-04 17:54:55 +0100 |
---|---|---|
committer | hjk <qtc-committer@nokia.com> | 2009-02-04 17:54:55 +0100 |
commit | 2d8326d21462570892dc82136f456ef03c883d83 (patch) | |
tree | f9990d096ac3ada8aacb1b2592d343571efe95ec | |
parent | 2c77b0b90393c133d06d074ceb8b4e38c034a2d2 (diff) | |
parent | 9e75f6e15505bcb51994cd13b5cca8c40945938d (diff) |
Merge branch '0.9.2-rc1' of git@scm.dev.nokia.troll.no:creator/mainline into 0.9.2-rc1
-rw-r--r-- | src/plugins/qt4projectmanager/qtversionmanager.cpp | 17 | ||||
-rw-r--r-- | src/plugins/qt4projectmanager/qtversionmanager.h | 2 |
2 files changed, 16 insertions, 3 deletions
diff --git a/src/plugins/qt4projectmanager/qtversionmanager.cpp b/src/plugins/qt4projectmanager/qtversionmanager.cpp index 6e67989158..4415a73209 100644 --- a/src/plugins/qt4projectmanager/qtversionmanager.cpp +++ b/src/plugins/qt4projectmanager/qtversionmanager.cpp @@ -177,7 +177,10 @@ void QtVersionManager::apply() } } } - m_versions = m_widget->versions(); + qDeleteAll(m_versions); + m_versions.clear(); + foreach(QtVersion *version, m_widget->versions()) + m_versions.append(new QtVersion(*version)); if (versionPathsChanged) updateDocumentation(); updateUniqueIdToIndexMap(); @@ -361,11 +364,16 @@ QtVersion *QtVersionManager::currentQtVersion() const QtDirWidget::QtDirWidget(QWidget *parent, QList<QtVersion *> versions, int defaultVersion) : QWidget(parent) - , m_versions(versions) , m_defaultVersion(defaultVersion) , m_specifyNameString(tr("<specify a name>")) , m_specifyPathString(tr("<specify a path>")) { + // Initialize m_versions + foreach(QtVersion *version, versions) { + m_versions.append(new QtVersion(*version)); + } + + m_ui.setupUi(this); m_ui.qtPath->setExpectedKind(Core::Utils::PathChooser::Directory); m_ui.qtPath->setPromptDialogTitle(tr("Select QTDIR")); @@ -417,6 +425,11 @@ QtDirWidget::QtDirWidget(QWidget *parent, QList<QtVersion *> versions, int defau updateState(); } +QtDirWidget::~QtDirWidget() +{ + qDeleteAll(m_versions); +} + void QtDirWidget::addQtDir() { QtVersion *newVersion = new QtVersion(m_specifyNameString, m_specifyPathString); diff --git a/src/plugins/qt4projectmanager/qtversionmanager.h b/src/plugins/qt4projectmanager/qtversionmanager.h index f6ccd017b6..11e5ec8235 100644 --- a/src/plugins/qt4projectmanager/qtversionmanager.h +++ b/src/plugins/qt4projectmanager/qtversionmanager.h @@ -122,7 +122,6 @@ private: // This is updated on first call to qmakeCommand // That function is called from updateVersionInfo() mutable QString m_qtVersionString; - Q_DISABLE_COPY(QtVersion); }; @@ -131,6 +130,7 @@ class QtDirWidget : public QWidget Q_OBJECT public: QtDirWidget(QWidget *parent, QList<QtVersion *> versions, int defaultVersion); + ~QtDirWidget(); QList<QtVersion *> versions() const; int defaultVersion() const; void finish(); |