Commit 67e16074 authored by dt's avatar dt
Browse files

Fixes: Add a button to show the qt version manager from the project settings page.

Task:     235982
parent f52a0129
...@@ -190,3 +190,4 @@ void CoreImpl::openFiles(const QStringList &arguments) ...@@ -190,3 +190,4 @@ void CoreImpl::openFiles(const QStringList &arguments)
{ {
m_mainwindow->openFiles(arguments); m_mainwindow->openFiles(arguments);
} }
...@@ -38,6 +38,9 @@ ...@@ -38,6 +38,9 @@
#include "qt4project.h" #include "qt4project.h"
#include "qt4projectmanager.h" #include "qt4projectmanager.h"
#include "ui_qt4buildconfigwidget.h" #include "ui_qt4buildconfigwidget.h"
#include <extensionsystem/pluginmanager.h>
#include <coreplugin/mainwindow.h>
#include "qt4projectmanagerconstants.h"
#include <QtGui/QFileDialog> #include <QtGui/QFileDialog>
...@@ -76,9 +79,11 @@ Qt4BuildConfigWidget::Qt4BuildConfigWidget(Qt4Project *project) ...@@ -76,9 +79,11 @@ Qt4BuildConfigWidget::Qt4BuildConfigWidget(Qt4Project *project)
connect(m_ui->importLabel, SIGNAL(linkActivated(QString)), connect(m_ui->importLabel, SIGNAL(linkActivated(QString)),
this, SLOT(importLabelClicked())); this, SLOT(importLabelClicked()));
connect(m_ui->manageQtVersionPushButtons, SIGNAL(clicked()),
this, SLOT(manageQtVersions()));
connect(m_pro->qt4ProjectManager()->versionManager(), SIGNAL(qtVersionsChanged()), connect(m_pro->qt4ProjectManager()->versionManager(), SIGNAL(qtVersionsChanged()),
this, SLOT(setupQtVersionsComboBox())); this, SLOT(setupQtVersionsComboBox()));
} }
Qt4BuildConfigWidget::~Qt4BuildConfigWidget() Qt4BuildConfigWidget::~Qt4BuildConfigWidget()
...@@ -86,6 +91,13 @@ Qt4BuildConfigWidget::~Qt4BuildConfigWidget() ...@@ -86,6 +91,13 @@ Qt4BuildConfigWidget::~Qt4BuildConfigWidget()
delete m_ui; 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 QString Qt4BuildConfigWidget::displayName() const
{ {
return tr("General"); return tr("General");
......
...@@ -64,6 +64,7 @@ private slots: ...@@ -64,6 +64,7 @@ private slots:
void shadowBuildLineEditTextChanged(); void shadowBuildLineEditTextChanged();
void importLabelClicked(); void importLabelClicked();
void qtVersionComboBoxCurrentIndexChanged(const QString &); void qtVersionComboBoxCurrentIndexChanged(const QString &);
void manageQtVersions();
private: private:
Ui::Qt4BuildConfigWidget *m_ui; Ui::Qt4BuildConfigWidget *m_ui;
......
...@@ -61,6 +61,13 @@ ...@@ -61,6 +61,13 @@
</property> </property>
</widget> </widget>
</item> </item>
<item>
<widget class="QPushButton" name="manageQtVersionPushButtons">
<property name="text">
<string>Manage Qt Versions</string>
</property>
</widget>
</item>
<item> <item>
<widget class="QLabel" name="invalidQtWarningLabel"> <widget class="QLabel" name="invalidQtWarningLabel">
<property name="text"> <property name="text">
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment