diff options
| author | Olivier Goffart <ogoffart@woboq.com> | 2014-01-26 14:02:51 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-29 00:18:15 +0100 |
| commit | e13b0cc4a08871af0fd4414f63d466712e0105d2 (patch) | |
| tree | a136db06b0e9910b72482715942c5a3eded8ed1f | |
| parent | b4c31488a7c8abc05871a39fa6b579c605429dcc (diff) | |
Fix usage of QObjectPrivate::connect when q_func() is private.
q_func() which is declared in Q_DECLARE_PUBLIC is usually private.
We should use q_ptr directly in QObjectPrivate::connect, otherwise
it does not compile when trying to access the private q_func
Change-Id: I235165a0994327102dbb31c390c2cafdffe806dc
Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
| -rw-r--r-- | src/corelib/kernel/qobject_p.h | 4 | ||||
| -rw-r--r-- | tests/auto/corelib/kernel/qobject/tst_qobject.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/corelib/kernel/qobject_p.h b/src/corelib/kernel/qobject_p.h index 9df438b518..180887b370 100644 --- a/src/corelib/kernel/qobject_p.h +++ b/src/corelib/kernel/qobject_p.h @@ -338,7 +338,7 @@ inline QMetaObject::Connection QObjectPrivate::connect(const typename QtPrivate: types = QtPrivate::ConnectionTypes<typename SignalType::Arguments>::types(); return QObject::connectImpl(sender, reinterpret_cast<void **>(&signal), - receiverPrivate->q_func(), reinterpret_cast<void **>(&slot), + receiverPrivate->q_ptr, reinterpret_cast<void **>(&slot), new QtPrivate::QPrivateSlotObject<Func2, typename QtPrivate::List_Left<typename SignalType::Arguments, SlotType::ArgumentCount>::Value, typename SignalType::ReturnType>(slot), type, types, &SignalType::Object::staticMetaObject); @@ -356,7 +356,7 @@ bool QObjectPrivate::disconnect(const typename QtPrivate::FunctionPointer< Func1 Q_STATIC_ASSERT_X((QtPrivate::CheckCompatibleArguments<typename SignalType::Arguments, typename SlotType::Arguments>::value), "Signal and slot arguments are not compatible."); return QObject::disconnectImpl(sender, reinterpret_cast<void **>(&signal), - receiverPrivate->q_func(), reinterpret_cast<void **>(&slot), + receiverPrivate->q_ptr, reinterpret_cast<void **>(&slot), &SignalType::Object::staticMetaObject); } diff --git a/tests/auto/corelib/kernel/qobject/tst_qobject.cpp b/tests/auto/corelib/kernel/qobject/tst_qobject.cpp index b6be7f0f3e..ac8aae8d3a 100644 --- a/tests/auto/corelib/kernel/qobject/tst_qobject.cpp +++ b/tests/auto/corelib/kernel/qobject/tst_qobject.cpp @@ -5564,8 +5564,8 @@ public: }; class ConnectToPrivateSlotPrivate : public QObjectPrivate { -public: Q_DECLARE_PUBLIC(ConnectToPrivateSlot) +public: int receivedCount; QVariant receivedValue; |