diff --git a/src/plugins/coreplugin/coreimpl.cpp b/src/plugins/coreplugin/coreimpl.cpp index 68653b52fc7..63521ce6f0a 100644 --- a/src/plugins/coreplugin/coreimpl.cpp +++ b/src/plugins/coreplugin/coreimpl.cpp @@ -190,3 +190,4 @@ void CoreImpl::openFiles(const QStringList &arguments) { m_mainwindow->openFiles(arguments); } + diff --git a/src/plugins/qt4projectmanager/qt4buildconfigwidget.cpp b/src/plugins/qt4projectmanager/qt4buildconfigwidget.cpp index de7141b0794..0a53b99b62d 100644 --- a/src/plugins/qt4projectmanager/qt4buildconfigwidget.cpp +++ b/src/plugins/qt4projectmanager/qt4buildconfigwidget.cpp @@ -38,6 +38,9 @@ #include "qt4project.h" #include "qt4projectmanager.h" #include "ui_qt4buildconfigwidget.h" +#include +#include +#include "qt4projectmanagerconstants.h" #include @@ -76,9 +79,11 @@ Qt4BuildConfigWidget::Qt4BuildConfigWidget(Qt4Project *project) connect(m_ui->importLabel, SIGNAL(linkActivated(QString)), this, SLOT(importLabelClicked())); + connect(m_ui->manageQtVersionPushButtons, SIGNAL(clicked()), + this, SLOT(manageQtVersions())); + connect(m_pro->qt4ProjectManager()->versionManager(), SIGNAL(qtVersionsChanged()), this, SLOT(setupQtVersionsComboBox())); - } Qt4BuildConfigWidget::~Qt4BuildConfigWidget() @@ -86,6 +91,13 @@ Qt4BuildConfigWidget::~Qt4BuildConfigWidget() delete m_ui; } +void Qt4BuildConfigWidget::manageQtVersions() +{ + Core::ICore *core = ExtensionSystem::PluginManager::instance()->getObject(); + core->showOptionsDialog(Constants::QT_CATEGORY, Constants::QTVERSION_PAGE); +} + + QString Qt4BuildConfigWidget::displayName() const { return tr("General"); diff --git a/src/plugins/qt4projectmanager/qt4buildconfigwidget.h b/src/plugins/qt4projectmanager/qt4buildconfigwidget.h index 5e584fa149f..47f19be95e4 100644 --- a/src/plugins/qt4projectmanager/qt4buildconfigwidget.h +++ b/src/plugins/qt4projectmanager/qt4buildconfigwidget.h @@ -64,6 +64,7 @@ private slots: void shadowBuildLineEditTextChanged(); void importLabelClicked(); void qtVersionComboBoxCurrentIndexChanged(const QString &); + void manageQtVersions(); private: Ui::Qt4BuildConfigWidget *m_ui; diff --git a/src/plugins/qt4projectmanager/qt4buildconfigwidget.ui b/src/plugins/qt4projectmanager/qt4buildconfigwidget.ui index ab5e8858611..7ce0d1950d1 100644 --- a/src/plugins/qt4projectmanager/qt4buildconfigwidget.ui +++ b/src/plugins/qt4projectmanager/qt4buildconfigwidget.ui @@ -61,6 +61,13 @@ + + + + Manage Qt Versions + + +