59065a8530
Commit 3695b35dfc accounted for pointer to
other incomplete types, but pointer-to-void was missed. This caused an
inconsistency in the stored metatype for void*, which is a built-in type
(QMetaType::VoidStar) but no pointer was recorded.
The test in tst_moc hadn't been enabled because the functions in
questions weren't extracted by moc. That is fixed in this commit.
Change-Id: I6f936da6f6e84d649f70fffd1706f613517a75fb
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
28 lines
707 B
C++
28 lines
707 B
C++
// Copyright (C) 2020 The Qt Company Ltd.
|
|
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
|
|
|
|
#ifndef POINTERY_TO_INCOMPLETE_H
|
|
#define POINTERY_TO_INCOMPLETE_H
|
|
|
|
#include <QObject>
|
|
#include <QSharedPointer>
|
|
#include <QWeakPointer>
|
|
#include <QPointer>
|
|
|
|
class FwdClass;
|
|
|
|
class TestPointeeCanBeIncomplete : public QObject
|
|
{
|
|
Q_OBJECT
|
|
public slots:
|
|
void setProp1(QPointer<FwdClass>) {}
|
|
void setProp2(QSharedPointer<FwdClass>) {}
|
|
void setProp3(const QWeakPointer<FwdClass> &) {}
|
|
void setProp4(FwdClass *) {}
|
|
void setProp5(const FwdClass *) {}
|
|
void setProp6(void *) {}
|
|
void setProp7(const void *) {}
|
|
};
|
|
|
|
#endif // POINTERY_TO_INCOMPLETE_H
|