diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-16 03:50:31 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-16 03:50:31 (GMT) |
| commit | ac0fc4e9b0ed314e7d49e8dc0e9ded0922aab8e9 (patch) | |
| tree | 58eb9feaa85fb02c3c15980f58964b112ca9d02d /doc/src/snippets | |
| parent | 140a96d0b860b045c18d53c1ac96e77b3893d31c (diff) | |
| parent | 551d704cdafae46cdccc6217bb7f36da7e84be2d (diff) | |
| download | Qt-ac0fc4e9b0ed314e7d49e8dc0e9ded0922aab8e9.zip Qt-ac0fc4e9b0ed314e7d49e8dc0e9ded0922aab8e9.tar.gz Qt-ac0fc4e9b0ed314e7d49e8dc0e9ded0922aab8e9.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (34 commits)
Fix duplicate project entry in visual studio solution file.
Doc
qdoc: Added the index and fixed images in the extra files list.
Speed up qsTr() by caching the translation context
Crash while printing from the portedcanvas example on Mac Cocoa.
qdoc: Fixed .qdocconf files for assistant.
Disable debug-only framework builds on Mac.
Compile (with -no-pch)
Add missing QT_NO_BEARERMANAGEMENT ifdefs.
Introduce a qconfig feature for Bearer Management
Fix MOBILITY-404
Remove holes in bearer management data structures.
Don't link bearer plugins against QtGui unnecessarily.
Added missing newline after warning message when using -L with qml
Doc: updating scripts
Fixed a crash on embedded due to uninitialized pointer.
Fix a race where QThread::exit() is "lost" when called after start()
qdoc: Removed all <table> attributes in favor of using css.
Autotest failure: dialogModality test fails on cocoa (macgui)
Force the bic test to compile in 32-bit mode on Mac
...
Diffstat (limited to 'doc/src/snippets')
| -rw-r--r-- | doc/src/snippets/code/src_corelib_kernel_qobject.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/doc/src/snippets/code/src_corelib_kernel_qobject.cpp b/doc/src/snippets/code/src_corelib_kernel_qobject.cpp index 2d86f8c..77c67ab 100644 --- a/doc/src/snippets/code/src_corelib_kernel_qobject.cpp +++ b/doc/src/snippets/code/src_corelib_kernel_qobject.cpp @@ -374,10 +374,13 @@ Q_PROPERTY(type name READ getFunction [WRITE setFunction] [RESET resetFunction] + [NOTIFY notifySignal] [DESIGNABLE bool] [SCRIPTABLE bool] [STORED bool] - [USER bool]) + [USER bool] + [CONSTANT] + [FINAL]) //! [36] |