diff --git a/src/plugins/coreplugin/coreimpl.cpp b/src/plugins/coreplugin/coreimpl.cpp index 68653b52fc7a7a5e963822e516350cef4e92de7a..63521ce6f0ac4a90b1a65abbeb0dcf2414fdb363 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 de7141b0794a2957808383ef6b7a5e725560cd07..0a53b99b62d37dc632f86546650619c2c84fbd26 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 <extensionsystem/pluginmanager.h> +#include <coreplugin/mainwindow.h> +#include "qt4projectmanagerconstants.h" #include <QtGui/QFileDialog> @@ -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::ICore>(); + 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 5e584fa149f4f52b6c2c894ab6b75b51b6c3c298..47f19be95e4eb286a1ccaab8694b91efe62b6b8e 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 ab5e8858611fa5ab5340d2d8bb897973169d3fe7..7ce0d1950d19a658dacb394fd61ab8a5d8a3830c 100644 --- a/src/plugins/qt4projectmanager/qt4buildconfigwidget.ui +++ b/src/plugins/qt4projectmanager/qt4buildconfigwidget.ui @@ -61,6 +61,13 @@ </property> </widget> </item> + <item> + <widget class="QPushButton" name="manageQtVersionPushButtons"> + <property name="text"> + <string>Manage Qt Versions</string> + </property> + </widget> + </item> <item> <widget class="QLabel" name="invalidQtWarningLabel"> <property name="text">