diff options
| author | João Abecasis <joao.abecasis@nokia.com> | 2012-01-25 17:40:24 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-31 16:17:55 +0100 |
| commit | 2bf186a2e598a4bccdc4979085e8e4d963a3819d (patch) | |
| tree | dee756d5a8b271bbd5950ea4ac1d7ca638054348 /src/corelib/io | |
| parent | 3855233dab82946ba50ddd90ce86df035998da8e (diff) | |
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>
Diffstat (limited to 'src/corelib/io')
| -rw-r--r-- | src/corelib/io/qtextstream.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/corelib/io/qtextstream.h b/src/corelib/io/qtextstream.h index e3686e10ef..3e1d0faa25 100644 --- a/src/corelib/io/qtextstream.h +++ b/src/corelib/io/qtextstream.h @@ -208,12 +208,6 @@ typedef void (QTextStream::*QTSMFI)(int); // manipulator w/int argument typedef void (QTextStream::*QTSMFC)(QChar); // manipulator w/QChar argument -namespace QtPrivate { -template <> struct IsPointerToTypeDerivedFromQObject<QTextStreamFunction> { - enum { Value = false }; -}; -} - class Q_CORE_EXPORT QTextStreamManipulator { public: |