path: root/src/network/kernel/qhostinfo.h
diff options
authorMarc Mutz <>2012-07-20 10:56:54 +0200
committerQt by Nokia <>2012-07-25 19:32:41 +0200
commit79b742b7e01ba5fa46b45578660d0e1f9ce0dae6 (patch)
treec17e06e84aed38d294e9d02ecca36bf51b4fc2a8 /src/network/kernel/qhostinfo.h
parent7d110111da72f9af5c94b66d402c18355bc16fda (diff)
QtNetwork: use nullary version of qRegisterMetaType<T>("T")
Using the nullary version has the advantage that multiple calls during a program run are much more efficient, since an inlined atomic is used to store the result. It also ensures that Q_DECLARE_METATYPE(T) has been used, whereas qRegisterMetaType<T>("T") will happily register anything. So I've added the macro where it was missing, or moved it to a central place when it existed hidden. In tst_qnetworkreply, this became a bit tricky, because a private header is conditionally included, so moved the Q_DECLARE_METATYPE() into a conditional section, too. Change-Id: I71484523e4277f4697b7d4b2ddc3505375162727 Reviewed-by: Stephen Kelly <>
Diffstat (limited to 'src/network/kernel/qhostinfo.h')
1 files changed, 2 insertions, 0 deletions
diff --git a/src/network/kernel/qhostinfo.h b/src/network/kernel/qhostinfo.h
index 2fc87f3bdc..602d4dad75 100644
--- a/src/network/kernel/qhostinfo.h
+++ b/src/network/kernel/qhostinfo.h
@@ -96,6 +96,8 @@ private:
#endif // QHOSTINFO_H