summaryrefslogtreecommitdiffstats
path: root/doc/src/snippets/code
diff options
context:
space:
mode:
authorThierry Bastian <thierry.bastian@nokia.com>2010-11-26 00:00:13 (GMT)
committerThierry Bastian <thierry.bastian@nokia.com>2010-11-26 00:00:13 (GMT)
commit7dec702b4ac6fba07640959a0666ab1b44e25f07 (patch)
treee640b2e533c69ea9878f63f2aeecce3d604a01a0 /doc/src/snippets/code
parentd8ee9ddffa4e0cad8c1d991ab6fb84b705c075e5 (diff)
parentccebbb663a1b21204057d8b799de3ddf1b63307e (diff)
downloadQt-7dec702b4ac6fba07640959a0666ab1b44e25f07.zip
Qt-7dec702b4ac6fba07640959a0666ab1b44e25f07.tar.gz
Qt-7dec702b4ac6fba07640959a0666ab1b44e25f07.tar.bz2
Merge branch 'master-upstream' into master-water
Diffstat (limited to 'doc/src/snippets/code')
-rw-r--r--doc/src/snippets/code/doc_src_properties.qdoc17
1 files changed, 14 insertions, 3 deletions
diff --git a/doc/src/snippets/code/doc_src_properties.qdoc b/doc/src/snippets/code/doc_src_properties.qdoc
index 7704160..a4ed409 100644
--- a/doc/src/snippets/code/doc_src_properties.qdoc
+++ b/doc/src/snippets/code/doc_src_properties.qdoc
@@ -91,7 +91,7 @@ for (int i=0; i<count; ++i) {
class MyClass : public QObject
{
Q_OBJECT
- Q_PROPERTY(Priority priority READ priority WRITE setPriority)
+ Q_PROPERTY(Priority priority READ priority WRITE setPriority NOTIFY priorityChanged)
Q_ENUMS(Priority)
public:
@@ -100,8 +100,19 @@ public:
enum Priority { High, Low, VeryHigh, VeryLow };
- void setPriority(Priority priority);
- Priority priority() const;
+ void setPriority(Priority priority)
+ {
+ m_priority = priority;
+ emit priorityChanged(priority);
+ }
+ Priority priority() const
+ { return m_priority; }
+
+signals:
+ void priorityChanged(Priority);
+
+private:
+ Priority m_priority;
};
//! [5]