diff options
| author | Olivier Goffart <ogoffart@woboq.com> | 2014-01-14 13:54:30 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-17 11:25:31 +0100 |
| commit | e59b28e08e7212415726fe9cd1b394e92607f061 (patch) | |
| tree | c6811145b66fc48b5d5b31f1783c203a2f419448 /tests/auto/corelib/kernel/qobject | |
| parent | 04b8af2739bb68b4c9648225c16cf6a515745fff (diff) | |
QObject: fix connection to function pointer with non-copyable references argument
For example, QObject is non copyable (its copy constructor is deleted or
private via Q_DISABLE_COPY). It should still be allowed to pass a reference
to a QObject as an argument to as signal (or slot).
This fixes a compilation failure.
Task-number: QTBUG-36119
Change-Id: I9bcf477e347d69fdae2543c99781b6421883be78
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'tests/auto/corelib/kernel/qobject')
| -rw-r--r-- | tests/auto/corelib/kernel/qobject/tst_qobject.cpp | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/tests/auto/corelib/kernel/qobject/tst_qobject.cpp b/tests/auto/corelib/kernel/qobject/tst_qobject.cpp index 8875998433..b6be7f0f3e 100644 --- a/tests/auto/corelib/kernel/qobject/tst_qobject.cpp +++ b/tests/auto/corelib/kernel/qobject/tst_qobject.cpp @@ -4759,6 +4759,9 @@ class LotsOfSignalsAndSlots: public QObject #endif*/ static void static_slot_vPFvvE(fptr) {} + void slot_vcRQObject(const QObject &) {} + void slot_vRQObject(QObject &) {} + signals: void signal_v(); void signal_vi(int); @@ -4776,6 +4779,9 @@ class LotsOfSignalsAndSlots: public QObject void const_signal_v() const; void const_signal_vi(int) const; + void signal_vcRQObject(const QObject &); + void signal_vRQObject(QObject &); + void signal(short&, short, long long, short); void otherSignal(const char *); }; @@ -4893,6 +4899,14 @@ void tst_QObject::connectCxx0xTypeMatching() QVERIFY(QObject::connect(&obj, &Foo::const_signal_vi, &obj, &Foo::slot_vi)); QVERIFY(QObject::connect(&obj, &Foo::signal_vi, &obj, &Foo::const_slot_vi)); QVERIFY(QObject::connect(&obj, &Foo::signal_vi, &obj, &Foo::const_slot_v)); + + QVERIFY(QObject::connect(&obj, &Foo::signal_vcRQObject, &obj, &Foo::slot_vcRQObject)); + QVERIFY(QObject::connect(&obj, &Foo::signal_vRQObject, &obj, &Foo::slot_vRQObject)); + QVERIFY(QObject::connect(&obj, &Foo::signal_vRQObject, &obj, &Foo::slot_vcRQObject)); + // QVERIFY(QObject::connect(&obj, &Foo::signal_vcRQObject, &obj, &Foo::slot_vRQObject)); // Should be an error (const& -> &) + + QVERIFY(QObject::connect(&obj, &Foo::signal_vRi, &obj, &Foo::slot_vs)); + } class StringVariant : public QObject |