diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-07-11 15:14:13 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-07-11 16:42:01 +0200 |
| commit | 3ef6cf060e984bca43956a23b61b32ec7347cfc7 (patch) | |
| tree | 14810e4d0168c0cc3d69cb286574bf28375c07bc /src/corelib/doc/snippets/code/src_corelib_kernel_qobject.cpp | |
| parent | b06304e164ba47351fa292662c1e6383c081b5ca (diff) | |
| parent | 7b9d6cf844ece18fef884f51117e25ad4ac31db5 (diff) | |
Merge branch 'stable' into dev
Conflicts:
qmake/generators/mac/pbuilder_pbx.cpp
src/corelib/json/qjsonwriter.cpp
src/corelib/kernel/qeventdispatcher_blackberry.cpp
src/plugins/platforms/cocoa/qcocoacolordialoghelper.mm
Change-Id: I24df576c4cbd18fa51b03122f71e32bb83b9028f
Diffstat (limited to 'src/corelib/doc/snippets/code/src_corelib_kernel_qobject.cpp')
| -rw-r--r-- | src/corelib/doc/snippets/code/src_corelib_kernel_qobject.cpp | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/src/corelib/doc/snippets/code/src_corelib_kernel_qobject.cpp b/src/corelib/doc/snippets/code/src_corelib_kernel_qobject.cpp index 68df53e0da..6a2305cc85 100644 --- a/src/corelib/doc/snippets/code/src_corelib_kernel_qobject.cpp +++ b/src/corelib/doc/snippets/code/src_corelib_kernel_qobject.cpp @@ -367,23 +367,6 @@ public: }; //! [35] - -//! [36] -Q_PROPERTY(type name - READ getFunction - [WRITE setFunction] - [RESET resetFunction] - [NOTIFY notifySignal] - [REVISION int] - [DESIGNABLE bool] - [SCRIPTABLE bool] - [STORED bool] - [USER bool] - [CONSTANT] - [FINAL]) -//! [36] - - //! [37] Q_PROPERTY(QString title READ title WRITE setTitle USER true) //! [37] |