diff options
Diffstat (limited to 'src/corelib/kernel')
| -rw-r--r-- | src/corelib/kernel/qobject_p.h | 1 | ||||
| -rw-r--r-- | src/corelib/kernel/qvariant.cpp | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/corelib/kernel/qobject_p.h b/src/corelib/kernel/qobject_p.h index 0a5d003b055..ad88bcf2741 100644 --- a/src/corelib/kernel/qobject_p.h +++ b/src/corelib/kernel/qobject_p.h @@ -198,6 +198,7 @@ public: static QObjectPrivate *get(QObject *o) { return o->d_func(); } + static const QObjectPrivate *get(const QObject *o) { return o->d_func(); } int signalIndex(const char *signalName, const QMetaObject **meta = 0) const; inline bool isSignalConnected(uint signalIdx, bool checkDeclarative = true) const; diff --git a/src/corelib/kernel/qvariant.cpp b/src/corelib/kernel/qvariant.cpp index e636c6fe52a..17c94e4e9dd 100644 --- a/src/corelib/kernel/qvariant.cpp +++ b/src/corelib/kernel/qvariant.cpp @@ -2363,7 +2363,7 @@ QByteArray QVariant::toByteArray() const \fn QPoint QVariant::toPoint() const Returns the variant as a QPoint if the variant has userType() - \l QMetaType::QPointF or \l QMetaType::QPointF; otherwise returns a null + \l QMetaType::QPoint or \l QMetaType::QPointF; otherwise returns a null QPoint. \sa canConvert(), convert() |