feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/3.4'

Browse Source 
Conflicts:
	src/libs/extensionsystem/pluginview.cpp

Change-Id: I316199fe0a257cb085668ccb183b1590555278f2
This commit is contained in:
Eike Ziller
2015-04-02 11:56:55 +02:00
parent 97631c25df fd0b383932
commit e56118cc1e
37 changed files with 344 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/qmljseditor/qmljscomponentfromobjectdef.cpp
View File

@@ -103,7 +103,10 @@ public:
{
QString componentName = m_componentName;
QString path = QFileInfo(fileName()).path();
ComponentNameDialog::go(&componentName, &path, Core::ICore::dialogParent());
bool confirm = ComponentNameDialog::go(&componentName, &path, Core::ICore::dialogParent());
if (!confirm)
return;
if (componentName.isEmpty() || path.isEmpty())
return;

5
src/plugins/qmljseditor/qmljscomponentnamedialog.cpp
View File

@@ -54,7 +54,7 @@ ComponentNameDialog::~ComponentNameDialog()
delete ui;
}
void ComponentNameDialog::go(QString *proposedName,
bool ComponentNameDialog::go(QString *proposedName,
QString *proposedPath,
QWidget *parent)
{
@@ -73,7 +73,10 @@ void ComponentNameDialog::go(QString *proposedName,
if (QDialog::Accepted == d.exec()) {
*proposedName = d.ui->componentNameEdit->text();
*proposedPath = d.ui->pathEdit->path();
return true;
}
return false;
}
void ComponentNameDialog::choosePath()

2
src/plugins/qmljseditor/qmljscomponentnamedialog.h
View File

@@ -46,7 +46,7 @@ public:
explicit ComponentNameDialog(QWidget *parent = 0);
~ComponentNameDialog();
static void go(QString *proposedName, QString *proposedPath, QWidget *parent = 0);
static bool go(QString *proposedName, QString *proposedPath, QWidget *parent = 0);
public slots:
void choosePath();