diff options
| author | Bea Lam <bea.lam@nokia.com> | 2010-03-05 03:56:47 (GMT) |
|---|---|---|
| committer | Bea Lam <bea.lam@nokia.com> | 2010-03-05 03:56:47 (GMT) |
| commit | 0c558e05f880cb51078b2d5e5281227352c1de3f (patch) | |
| tree | 809e95ab06fc5d757c1d66493de5c9376866aee1 /doc/src/snippets/code | |
| parent | af81ea8a5abbd9a94eb6ab5c3fe0425779905d5a (diff) | |
| parent | 48fd47f64f3f73e82016161d82cdf67908a9c653 (diff) | |
| download | Qt-0c558e05f880cb51078b2d5e5281227352c1de3f.zip Qt-0c558e05f880cb51078b2d5e5281227352c1de3f.tar.gz Qt-0c558e05f880cb51078b2d5e5281227352c1de3f.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'doc/src/snippets/code')
| -rw-r--r-- | doc/src/snippets/code/doc_src_emb-pointer.qdoc | 5 | ||||
| -rw-r--r-- | doc/src/snippets/code/src_corelib_kernel_qmetatype.cpp | 5 |
2 files changed, 9 insertions, 1 deletions
diff --git a/doc/src/snippets/code/doc_src_emb-pointer.qdoc b/doc/src/snippets/code/doc_src_emb-pointer.qdoc index 9661ae5..0d66e18 100644 --- a/doc/src/snippets/code/doc_src_emb-pointer.qdoc +++ b/doc/src/snippets/code/doc_src_emb-pointer.qdoc @@ -77,7 +77,10 @@ export QWS_MOUSE_PROTO="Vr41xx:press=500:/dev/misc/ts" //! [7] -./configure -L <path to tslib library> -I <path to tslib headers> +.... +QMAKE_CFLAGS += -I<path to tslib headers> +QMAKE_LFLAGS += -L<path to tslib library> -Wl,-rpath-link=<path to tslib library> +.... //! [7] diff --git a/doc/src/snippets/code/src_corelib_kernel_qmetatype.cpp b/doc/src/snippets/code/src_corelib_kernel_qmetatype.cpp index bff72a0..19e37ba 100644 --- a/doc/src/snippets/code/src_corelib_kernel_qmetatype.cpp +++ b/doc/src/snippets/code/src_corelib_kernel_qmetatype.cpp @@ -108,3 +108,8 @@ int id = qRegisterMetaType<MyStruct>(); int id = qMetaTypeId<QString>(); // id is now QMetaType::QString id = qMetaTypeId<MyStruct>(); // compile error if MyStruct not declared //! [8] + +//! [9] +typedef QString CustomString; +qRegisterMetaType<CustomString>("CustomString"); +//! [9] |