diff options
| author | Eike Ziller <eike.ziller@nokia.com> | 2012-03-08 07:48:55 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@nokia.com> | 2012-03-08 07:48:55 +0100 |
| commit | 4b8df15f3d904f39e78b975fb3bedba03dcce9c1 (patch) | |
| tree | ca71b9f2ed39590a6b0fd28305cad9c9544e2d36 /src/plugins/qmljseditor | |
| parent | 3a808b0fd8a2e9d89ff01f51ffa6014f8207979d (diff) | |
| parent | 62fd2713d00ed3756cead7072cbbd61e631e6670 (diff) | |
| download | qt-creator-4b8df15f3d904f39e78b975fb3bedba03dcce9c1.tar.gz | |
Merge remote-tracking branch 'origin/2.5'
Conflicts:
src/plugins/remotelinux/startgdbserverdialog.cpp
Change-Id: I69597e20d5372e9baf12ac09fc20d39406683f9e
Diffstat (limited to 'src/plugins/qmljseditor')
| -rw-r--r-- | src/plugins/qmljseditor/quicktoolbar.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/qmljseditor/quicktoolbar.cpp b/src/plugins/qmljseditor/quicktoolbar.cpp index 7b98329583..02825d01e4 100644 --- a/src/plugins/qmljseditor/quicktoolbar.cpp +++ b/src/plugins/qmljseditor/quicktoolbar.cpp @@ -456,7 +456,7 @@ ContextPaneWidget* QuickToolBar::contextWidget() m_widget = new ContextPaneWidget; connect(m_widget.data(), SIGNAL(propertyChanged(QString,QVariant)), this, SLOT(onPropertyChanged(QString,QVariant))); connect(m_widget.data(), SIGNAL(removeProperty(QString)), this, SLOT(onPropertyRemoved(QString))); - connect(m_widget.data(), SIGNAL(removeAndChangeProperty(QString,QString,QVariant, bool)), this, SLOT(onPropertyRemovedAndChange(QString,QString,QVariant, bool))); + connect(m_widget.data(), SIGNAL(removeAndChangeProperty(QString,QString,QVariant,bool)), this, SLOT(onPropertyRemovedAndChange(QString,QString,QVariant,bool))); connect(m_widget.data(), SIGNAL(enabledChanged(bool)), this, SLOT(onEnabledChanged(bool))); connect(m_widget.data(), SIGNAL(pinnedChanged(bool)), this, SLOT(onPinnedChanged(bool))); connect(m_widget.data(), SIGNAL(closed()), this, SIGNAL(closed())); |