summaryrefslogtreecommitdiffstats
path: root/tools/shared/qtgradienteditor/qtgradientviewdialog.cpp
diff options
context:
space:
mode:
authorBill King <bill.king@nokia.com>2009-11-20 04:29:51 (GMT)
committerBill King <bill.king@nokia.com>2009-11-20 04:29:51 (GMT)
commit5b1a07e9ccf0a5139273b447e2b2fda6564a506a (patch)
tree6ad6fc7836747044713ade6e75d7230b848ba46e /tools/shared/qtgradienteditor/qtgradientviewdialog.cpp
parent0186faea383f3f8223bffd1844e5a47ca22770a5 (diff)
parentea0f526ac3a7daef5d4ebff2373a01d4088e28c3 (diff)
downloadQt-5b1a07e9ccf0a5139273b447e2b2fda6564a506a.zip
Qt-5b1a07e9ccf0a5139273b447e2b2fda6564a506a.tar.gz
Qt-5b1a07e9ccf0a5139273b447e2b2fda6564a506a.tar.bz2
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'tools/shared/qtgradienteditor/qtgradientviewdialog.cpp')
-rw-r--r--tools/shared/qtgradienteditor/qtgradientviewdialog.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/shared/qtgradienteditor/qtgradientviewdialog.cpp b/tools/shared/qtgradienteditor/qtgradientviewdialog.cpp
index 0eff338..6f3d88a 100644
--- a/tools/shared/qtgradienteditor/qtgradientviewdialog.cpp
+++ b/tools/shared/qtgradienteditor/qtgradientviewdialog.cpp
@@ -50,10 +50,10 @@ QtGradientViewDialog::QtGradientViewDialog(QWidget *parent)
{
m_ui.setupUi(this);
m_ui.buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false);
- connect(m_ui.gradientView, SIGNAL(currentGradientChanged(const QString &)),
- this, SLOT(slotGradientSelected(const QString &)));
- connect(m_ui.gradientView, SIGNAL(gradientActivated(const QString &)),
- this, SLOT(slotGradientActivated(const QString &)));
+ connect(m_ui.gradientView, SIGNAL(currentGradientChanged(QString)),
+ this, SLOT(slotGradientSelected(QString)));
+ connect(m_ui.gradientView, SIGNAL(gradientActivated(QString)),
+ this, SLOT(slotGradientActivated(QString)));
}
void QtGradientViewDialog::setGradientManager(QtGradientManager *manager)