diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-02-20 19:45:18 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-02-20 19:45:40 +0100 |
| commit | c52cf2ad2d41b2878f1d19a5ffbfe0d0ee091f3f (patch) | |
| tree | 40cc6472ba9e4e402b41120f9e584565e9c8df45 /tests/auto/qscriptextqobject/tst_qscriptextqobject.cpp | |
| parent | 3b26f6f6643978c9d041a6267dc88e2a59ced763 (diff) | |
| parent | 7a09d123cb29129419dea33c4e2ef0217b339a44 (diff) | |
| download | qtscript-c52cf2ad2d41b2878f1d19a5ffbfe0d0ee091f3f.tar.gz | |
Merge branch 'stable' into release
Change-Id: I7178c6375a3c2a555d9eb88922082d3af22a3f20
Diffstat (limited to 'tests/auto/qscriptextqobject/tst_qscriptextqobject.cpp')
| -rw-r--r-- | tests/auto/qscriptextqobject/tst_qscriptextqobject.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/qscriptextqobject/tst_qscriptextqobject.cpp b/tests/auto/qscriptextqobject/tst_qscriptextqobject.cpp index fdf1b7c..78c0151 100644 --- a/tests/auto/qscriptextqobject/tst_qscriptextqobject.cpp +++ b/tests/auto/qscriptextqobject/tst_qscriptextqobject.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the test suite of the Qt Toolkit. @@ -2343,7 +2343,7 @@ void tst_QScriptExtQObject::cppConnectAndDisconnect2() QVERIFY(qScriptConnect(m_myObject, SIGNAL(mySignal()), QScriptValue(), fun)); QCOMPARE(m_myObject->connectNotifySignals().size(), 2); QVERIFY(m_myObject->hasConnectNotifySignal(QMetaMethod::fromSignal(&MyQObject::mySignal))); - // We get a destroyed() connection as well, used internally by QtScript + // We get a destroyed() connection as well, used internally by Qt Script QVERIFY(m_myObject->hasConnectNotifySignal(QMetaMethod::fromSignal(&QObject::destroyed))); m_myObject->clearDisconnectNotifySignals(); |