summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@nokia.com>2011-05-16 09:40:29 +0200
committerFriedemann Kleint <Friedemann.Kleint@nokia.com>2011-05-16 09:40:29 +0200
commitf5a37db6c4ed35ad27acaa75d22102fa13f97b0c (patch)
treef4a4408058879e1b30b9f8572a74a82fdaa22993 /src
parent68dd1284f7c62760b13c9648086b4b049fdd5e08 (diff)
downloadqt-creator-f5a37db6c4ed35ad27acaa75d22102fa13f97b0c.tar.gz
Utils: Fix colorbutton slot warning.
Fix up e8cc99632c41fade55cc7ff150c0d0eb3c290d60.
Diffstat (limited to 'src')
-rw-r--r--src/libs/utils/qtcolorbutton.cpp12
1 files changed, 7 insertions, 5 deletions
diff --git a/src/libs/utils/qtcolorbutton.cpp b/src/libs/utils/qtcolorbutton.cpp
index e70804cc23..23a8a001e8 100644
--- a/src/libs/utils/qtcolorbutton.cpp
+++ b/src/libs/utils/qtcolorbutton.cpp
@@ -45,7 +45,13 @@ class QtColorButtonPrivate: public QObject
Q_OBJECT
QtColorButton *q_ptr;
Q_DECLARE_PUBLIC(QtColorButton)
+public slots:
+ void slotEditColor();
+
public:
+ QColor shownColor() const;
+ QPixmap generatePixmap() const;
+
QColor m_color;
#ifndef QT_NO_DRAGANDDROP
QColor m_dragColor;
@@ -54,10 +60,6 @@ public:
#endif
bool m_backgroundCheckered;
bool m_alphaAllowed;
-
- void slotEditColor();
- QColor shownColor() const;
- QPixmap generatePixmap() const;
};
void QtColorButtonPrivate::slotEditColor()
@@ -132,7 +134,7 @@ QtColorButton::QtColorButton(QWidget *parent)
setAcceptDrops(true);
- connect(this, SIGNAL(clicked()), this, SLOT(slotEditColor()));
+ connect(this, SIGNAL(clicked()), d_ptr, SLOT(slotEditColor()));
setSizePolicy(QSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred));
}