2 files changed, 2 insertions, 3 deletions
diff --git a/src/widgets/widgets/qabstractscrollarea.cpp b/src/widgets/widgets/qabstractscrollarea.cpp
index 801160d080..901ea99c1b 100644
--- a/src/widgets/widgets/qabstractscrollarea.cpp
+++ b/src/widgets/widgets/qabstractscrollarea.cpp
@@ -572,7 +572,7 @@ void QAbstractScrollArea::setViewport(QWidget *widget)
         d->layoutChildren();
         if (isVisible())
             d->viewport->show();
-        QMetaObject::invokeMethod(this, "setupViewport", Q_ARG(QWidget *, widget));
+        setupViewport(widget);
         delete oldViewport;
     }
 }
diff --git a/src/widgets/widgets/qabstractscrollarea.h b/src/widgets/widgets/qabstractscrollarea.h
index 3f2a273297..2288888286 100644
--- a/src/widgets/widgets/qabstractscrollarea.h
+++ b/src/widgets/widgets/qabstractscrollarea.h
@@ -90,8 +90,7 @@ public:
 
     QSize sizeHint() const;
 
-protected Q_SLOTS:
-    void setupViewport(QWidget *viewport);
+    virtual void setupViewport(QWidget *viewport);
 
 protected:
     QAbstractScrollArea(QAbstractScrollAreaPrivate &dd, QWidget *parent = 0);