1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QDnsLookup: remove the explicit metatype registration for the Reply type

Browse Source 
It's unnecessary in Qt 6 if we use the new-style connect or if the type
was fully defined in the compilation of the unit containing the moc
output.

Change-Id: I3e3bfef633af4130a03afffd175e6f4e87adf5e1
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
This commit is contained in:
Thiago Macieira 2023-05-12 08:34:53 -07:00
parent d26709cd8c
commit 471f134cdd
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/network/kernel/qdnslookup.cpp
View File

@ -231,8 +231,8 @@ const char *QDnsLookupPrivate::msgNoIpV6NameServerAdresses =
QDnsLookup::QDnsLookup(QObject *parent) QDnsLookup::QDnsLookup(QObject *parent)
: QObject(*new QDnsLookupPrivate, parent) : QObject(*new QDnsLookupPrivate, parent)
{ {
qRegisterMetaType<QDnsLookupReply>();
} }
/*! /*!
Constructs a QDnsLookup object for the given \a type and \a name and sets Constructs a QDnsLookup object for the given \a type and \a name and sets
\a parent as the parent object. \a parent as the parent object.
@ -242,7 +242,6 @@ QDnsLookup::QDnsLookup(Type type, const QString &name, QObject *parent)
: QObject(*new QDnsLookupPrivate, parent) : QObject(*new QDnsLookupPrivate, parent)
{ {
Q_D(QDnsLookup); Q_D(QDnsLookup);
qRegisterMetaType<QDnsLookupReply>();
d->name = name; d->name = name;
d->type = type; d->type = type;
} }
@ -258,7 +257,6 @@ QDnsLookup::QDnsLookup(Type type, const QString &name, const QHostAddress &names
: QObject(*new QDnsLookupPrivate, parent) : QObject(*new QDnsLookupPrivate, parent)
{ {
Q_D(QDnsLookup); Q_D(QDnsLookup);
qRegisterMetaType<QDnsLookupReply>();
d->name = name; d->name = name;
d->type = type; d->type = type;
d->nameserver = nameserver; d->nameserver = nameserver;
@ -475,8 +473,8 @@ void QDnsLookup::lookup()
d->isFinished = false; d->isFinished = false;
d->reply = QDnsLookupReply(); d->reply = QDnsLookupReply();
d->runnable = new QDnsLookupRunnable(d->type, QUrl::toAce(d->name), d->nameserver); d->runnable = new QDnsLookupRunnable(d->type, QUrl::toAce(d->name), d->nameserver);
connect(d->runnable, SIGNAL(finished(QDnsLookupReply)), connect(d->runnable, &QDnsLookupRunnable::finished,
this, SLOT(_q_lookupFinished(QDnsLookupReply)), this, [this](const QDnsLookupReply &reply) { d_func()->_q_lookupFinished(reply); },
Qt::BlockingQueuedConnection); Qt::BlockingQueuedConnection);
#if QT_CONFIG(thread) #if QT_CONFIG(thread)
theDnsLookupThreadPool()->start(d->runnable); theDnsLookupThreadPool()->start(d->runnable);