Merge remote-tracking branch 'origin/dev' into 5.14

 Conflicts:
	src/widgets/kernel/qwidget.cpp
	src/widgets/kernel/qwidget_p.h
	src/widgets/kernel/qwidgetrepaintmanager.cpp
	src/widgets/kernel/qwidgetwindow.cpp
	tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp

Change-Id: Ifae457d0427be8e2465e474b055722e11b3b1e5c

2 files changed, 0 insertions, 28 deletions

diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp
index 4a26e9cdc0..9251a3c05f 100644
--- a/src/corelib/kernel/qobject.cpp
+++ b/src/corelib/kernel/qobject.cpp
@@ -527,28 +527,6 @@ inline void QMetaCallEvent::allocArgs()
 /*!
     \internal
 
-    Only used by QtDeclarative - to be removed when migrated.
- */
-QMetaCallEvent::QMetaCallEvent(ushort method_offset, ushort method_relative,
-                               QObjectPrivate::StaticMetaCallFunction callFunction,
-                               const QObject *sender, int signalId,
-                               int nargs, int *types_, void **args_)
-    : QAbstractMetaCallEvent(sender, signalId),
-      d({nullptr, nullptr, callFunction, nargs, method_offset, method_relative}),
-      prealloc_()
-{
-    allocArgs();
-    for (int arg = 0; arg < nargs; ++arg) {
-        types()[arg] = types_[arg];
-        args()[arg] = args_[arg];
-    }
-    free(types_);
-    free(args_);
-}
-
-/*!
-    \internal
-
     Used for blocking queued connections, just passes \a args through without
     allocating any memory.
  */
diff --git a/src/corelib/kernel/qobject_p.h b/src/corelib/kernel/qobject_p.h
index 5d0b3a8399..feafcaf323 100644
--- a/src/corelib/kernel/qobject_p.h
+++ b/src/corelib/kernel/qobject_p.h
@@ -509,12 +509,6 @@ private:
 class Q_CORE_EXPORT QMetaCallEvent : public QAbstractMetaCallEvent
 {
 public:
-    // kept for compatibility until QtDeclarative has moved over
-    QMetaCallEvent(ushort method_offset, ushort method_relative,
-                   QObjectPrivate::StaticMetaCallFunction callFunction,
-                   const QObject *sender, int signalId,
-                   int nargs, int *types, void **args);
-
     // blocking queued with semaphore - args always owned by caller
     QMetaCallEvent(ushort method_offset, ushort method_relative,
                    QObjectPrivate::StaticMetaCallFunction callFunction,