forked from qt-creator/qt-creator
Fixes: Add a button to show the qt version manager from the project settings page.
Task: 235982
This commit is contained in:
@@ -190,3 +190,4 @@ void CoreImpl::openFiles(const QStringList &arguments)
|
||||
{
|
||||
m_mainwindow->openFiles(arguments);
|
||||
}
|
||||
|
||||
|
||||
@@ -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");
|
||||
|
||||
@@ -64,6 +64,7 @@ private slots:
|
||||
void shadowBuildLineEditTextChanged();
|
||||
void importLabelClicked();
|
||||
void qtVersionComboBoxCurrentIndexChanged(const QString &);
|
||||
void manageQtVersions();
|
||||
|
||||
private:
|
||||
Ui::Qt4BuildConfigWidget *m_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">
|
||||
|
||||
Reference in New Issue
Block a user