diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-07 15:18:16 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-07 15:18:16 +0100 |
| commit | cdf13ce286b14273e1e29c5bb02cbc880f31b786 (patch) | |
| tree | 10733cb3fb35647b19cfd15ab158f56b1cb550e1 /src/testlib | |
| parent | 21d607c81af0cd285e9bb3869ac3cd18358f1c8f (diff) | |
| parent | a8321f21fb82714771b4717c99dd475f2c74649e (diff) | |
Merge branch 'stable' into dev
Conflicts:
tests/auto/widgets/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp
Change-Id: I6b8d505fc22f052c307ca27f58f7d16f98965f47
Diffstat (limited to 'src/testlib')
| -rw-r--r-- | src/testlib/doc/snippets/code/doc_src_qsignalspy.cpp | 6 | ||||
| -rw-r--r-- | src/testlib/qsignalspy.qdoc | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/testlib/doc/snippets/code/doc_src_qsignalspy.cpp b/src/testlib/doc/snippets/code/doc_src_qsignalspy.cpp index 6741ae7942..694f206212 100644 --- a/src/testlib/doc/snippets/code/doc_src_qsignalspy.cpp +++ b/src/testlib/doc/snippets/code/doc_src_qsignalspy.cpp @@ -65,14 +65,14 @@ QVERIFY(arguments.at(2).type() == QVariant::double); //! [2] -qRegisterMetaType<QModelIndex>("QModelIndex"); -QSignalSpy spy(&model, SIGNAL(whatever(QModelIndex))); +qRegisterMetaType<SomeStruct>(); +QSignalSpy spy(&model, SIGNAL(whatever(SomeStruct))); //! [2] //! [3] // get the first argument from the first received signal: -QModelIndex result = qvariant_cast<QModelIndex>(spy.at(0).at(0)); +SomeStruct result = qvariant_cast<SomeStruct>(spy.at(0).at(0)); //! [3] diff --git a/src/testlib/qsignalspy.qdoc b/src/testlib/qsignalspy.qdoc index d36716bf2e..3d7b17a145 100644 --- a/src/testlib/qsignalspy.qdoc +++ b/src/testlib/qsignalspy.qdoc @@ -54,7 +54,7 @@ \snippet code/doc_src_qsignalspy.cpp 2 - To retrieve the \c QModelIndex, you can use qvariant_cast: + To retrieve the instance, you can use qvariant_cast: \snippet code/doc_src_qsignalspy.cpp 3 */ |