Allow function types to be registered without workarounds
authorJoão Abecasis <joao.abecasis@nokia.com>
Wed, 25 Jan 2012 16:40:24 +0000 (17:40 +0100)
committerQt by Nokia <qt-info@nokia.com>
Tue, 31 Jan 2012 15:17:55 +0000 (16:17 +0100)
commit2bf186a2e598a4bccdc4979085e8e4d963a3819d
treedee756d5a8b271bbd5950ea4ac1d7ca638054348
parent3855233dab82946ba50ddd90ce86df035998da8e
Allow function types to be registered without workarounds

Commit 4b8ceb41aed352f10d36db5284453f425dbc5f3f added the requirement
that pointed-to types need to be registered when registering pointer
types. Unfortunately, the implementation also affects function pointer
types.

This change whitelists 0, 1, 2 and 3 argument functions as not deriving
from QObject, forgoing the need to workaround details of the type
registration implementation when registering those function pointer
types.

Change-Id: I4d855e9d70a8179a6e31b84623ad5bf063e0d6d8
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
src/corelib/io/qtextstream.h
src/corelib/kernel/qmetatype.h
tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp
tests/auto/other/exceptionsafety_objects/tst_exceptionsafety_objects.cpp
tests/benchmarks/corelib/tools/qstring/main.cpp