QTimer::singleShot() can call receiver in wrong thread

TEST(QTimer, SingleShotToSLOT_HandlesMoveThreadCorrectly)
{
    // Given: A singleShot timer is queued to call QObject SLOT() in first thread
    QObjectWithSlot object;
    QTimer::singleShot(1000, &object, SLOT(CheckExpectedThread()));

    // When: object is moved to a second thread
    QThreadWithStop secondThread;
    secondThread.start();
    object.moveToThread(&secondThread);

    // Then: objects SLOT will be called in the second thread.
    object.m_ExpectedThread = &secondThread;
    QCoreApplication::exec();
    EXPECT_TRUE(object.m_SlotCalled);
}

TEST(QTimer, SingleShotToSlotObj_DoesNotHandleMoveThreadCorrectly)
{
    // Given: A singleShot timer is queued to call &QObject::method in first thread
    QObjectWithSlot object;
    QTimer::singleShot(1000, &object, &QObjectWithSlot::CheckExpectedThread);

    // When: object is moved to another thread
    QThreadWithStop secondThread;
    secondThread.start();
    object.moveToThread(&secondThread);

    // Then: objects method should be called in the second thread.
    object.m_ExpectedThread = &secondThread;
#if (QT_VERSION <= QT_VERSION_CHECK(5,12,5))    
    // However: Due to QT bug, objects method will be incorrectly called in the first thread.
    object.m_ExpectedThread = QThread::currentThread();
#endif    
    QCoreApplication::exec();
    EXPECT_TRUE(object.m_SlotCalled);
}

QSingleShotTimer::QSingleShotTimer(int msec, Qt::TimerType timerType, const QObject *r, const char *member)
    : QObject(QAbstractEventDispatcher::instance()), hasValidReceiver(true), slotObj(0)
{
    timerId = startTimer(msec, timerType);
    connect(this, SIGNAL(timeout()), r, member);
}

QSingleShotTimer::QSingleShotTimer(int msec, Qt::TimerType timerType, const QObject *r, QtPrivate::QSlotObjectBase *slotObj)
    : QObject(QAbstractEventDispatcher::instance()), hasValidReceiver(r), receiver(r), slotObj(slotObj)
{
    timerId = startTimer(msec, timerType);
    if (r && thread() != r->thread()) {
        // Avoid leaking the QSingleShotTimer instance in case the application exits before the timer fires
        connect(QCoreApplication::instance(), &QCoreApplication::aboutToQuit, this, &QObject::deleteLater);
        setParent(0);
        moveToThread(r->thread());
    }
}

    connect(this, &QTimer::timeout, receiver, slot);

class QObjectWithSlot : public QObject
{
Q_OBJECT;
public slots:
    void CheckExpectedThread()
    {
        m_SlotCalled = true;
        EXPECT_EQ(QThread::currentThread(), m_ExpectedThread);
        QCoreApplication::quit();
    }

public:    
    QThread* m_ExpectedThread = nullptr;
    bool m_SlotCalled = false;
};

class QThreadWithStop : public QThread
{
public:
    ~QThreadWithStop()
    {
        quit();
        wait();
    }
};