Merge remote-tracking branch 'upstream/master' into wpushbutton_default

Conflicts:
	src/widget/knobeventhandler.h
	src/widget/wslidercomposed.cpp

1 files changed, 1 insertions, 1 deletions

diff --git a/src/widget/wpushbutton.h b/src/widget/wpushbutton.h
index 52aeead901..f74a24a42b 100644
--- a/src/widget/wpushbutton.h
+++ b/src/widget/wpushbutton.h
@@ -70,7 +70,7 @@ class WPushButton : public WWidget {
 
     // Associates a background pixmap with the widget. This is only needed if
     // the button pixmaps contains alpha channel values.
-    void setPixmapBackground(const QString &filename);
+    void setPixmapBackground(const QString &filename, Paintable::DrawMode mode);
 
     // True, if the button is currently pressed
     bool m_bPressed;