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

QmlDesigner: Rename SLOT to different name then the signal

Browse Source 
Change-Id: I79857fb7fb76ab6bb5c4f2d668c30a6552cadb00
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
This commit is contained in:
Thomas Hartmann
2015-07-09 13:46:54 +02:00
committed by Thomas Hartmann
parent 2c32e57877
commit 80eb278765
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/qmldesigner/designmodewidget.cpp
View File

@@ -185,7 +185,7 @@ DesignModeWidget::DesignModeWidget(QWidget *parent) :
m_navigatorHistoryCounter(-1), m_navigatorHistoryCounter(-1),
m_keepNavigatorHistory(false) m_keepNavigatorHistory(false)
{ {
QObject::connect(viewManager().nodeInstanceView(), SIGNAL(qmlPuppetCrashed()), this, SLOT(qmlPuppetCrashed())); QObject::connect(viewManager().nodeInstanceView(), SIGNAL(qmlPuppetCrashed()), this, SLOT(showQmlPuppetCrashedError()));
} }
DesignModeWidget::~DesignModeWidget() DesignModeWidget::~DesignModeWidget()
@@ -460,7 +460,7 @@ void DesignModeWidget::deleteSidebarWidgets()
m_rightSideBar.reset(); m_rightSideBar.reset();
} }
void DesignModeWidget::qmlPuppetCrashed() void DesignModeWidget::showQmlPuppetCrashedError()
{ {
QList<RewriterError> errorList; QList<RewriterError> errorList;
RewriterError error(tr("Qt Quick emulation layer crashed")); RewriterError error(tr("Qt Quick emulation layer crashed"));

2
src/plugins/qmldesigner/designmodewidget.h
View File

@@ -125,7 +125,7 @@ private slots:
void updateAvailableSidebarItemsRight(); void updateAvailableSidebarItemsRight();
void deleteSidebarWidgets(); void deleteSidebarWidgets();
void qmlPuppetCrashed(); void showQmlPuppetCrashedError();
void toolBarOnGoBackClicked(); void toolBarOnGoBackClicked();
void toolBarOnGoForwardClicked(); void toolBarOnGoForwardClicked();