diff options
| author | J-P Nurmi <jpnurmi@digia.com> | 2014-06-05 22:26:44 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@digia.com> | 2014-06-05 22:26:44 +0200 |
| commit | 0fcce50af009f97efa2a5c5f2c74415c92830962 (patch) | |
| tree | f8abf0e4f445fed9480b426b2f856b50911f1210 /src/corelib/doc | |
| parent | 74d46a669badc5bf32187686102ca4e644a3c0af (diff) | |
| parent | c54f7720d09e7d00f3309736bbeaaa6a81967ec1 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
mkspecs/features/qt.prf
src/plugins/platforms/xcb/qxcbwindow.h
src/tools/qdoc/qdocindexfiles.cpp
src/widgets/kernel/qwidget_qpa.cpp
Change-Id: I214f57b03bc2ff86cf3b7dfe2966168af93a5a67
Diffstat (limited to 'src/corelib/doc')
| -rw-r--r-- | src/corelib/doc/snippets/code/src_corelib_io_qprocess.cpp | 2 | ||||
| -rw-r--r-- | src/corelib/doc/snippets/code/src_corelib_kernel_qmetaobject.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/doc/snippets/code/src_corelib_io_qprocess.cpp b/src/corelib/doc/snippets/code/src_corelib_io_qprocess.cpp index b5d71079da..e9c3caae5b 100644 --- a/src/corelib/doc/snippets/code/src_corelib_io_qprocess.cpp +++ b/src/corelib/doc/snippets/code/src_corelib_io_qprocess.cpp @@ -121,7 +121,7 @@ process.start("dir \"My Documents\""); //! [7] QProcess process; -process.start("dir \"\"\"My Documents\"\"\""); +process.start("dir \"Epic 12\"\"\" Singles\""); //! [7] diff --git a/src/corelib/doc/snippets/code/src_corelib_kernel_qmetaobject.cpp b/src/corelib/doc/snippets/code/src_corelib_kernel_qmetaobject.cpp index c0675d6cf0..708cacdf6e 100644 --- a/src/corelib/doc/snippets/code/src_corelib_kernel_qmetaobject.cpp +++ b/src/corelib/doc/snippets/code/src_corelib_kernel_qmetaobject.cpp @@ -124,7 +124,7 @@ QMetaMethod::invoke: Unable to handle unregistered datatype 'MyType' QString retVal; QByteArray normalizedSignature = QMetaObject::normalizedSignature("compute(QString, int, double)"); int methodIndex = obj->metaObject()->indexOfMethod(normalizedSignature); -QMetaMethod method = metaObject->method(methodIndex); +QMetaMethod method = obj->metaObject()->method(methodIndex); method.invoke(obj, Qt::DirectConnection, Q_RETURN_ARG(QString, retVal), |