Merge remote branch 'origin/master' into file-engine-refactor

master's version of conflicting def files picked.

Conflicts:
	src/s60installs/bwins/QtCoreu.def
	src/s60installs/bwins/QtGuiu.def
	src/s60installs/bwins/QtNetworku.def
	src/s60installs/eabi/QtCoreu.def
	src/s60installs/eabi/QtGuiu.def

3 files changed, 22 insertions, 11 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]
 
diff --git a/doc/src/snippets/moc/myclass2.h b/doc/src/snippets/moc/myclass2.h
index ca79515..daea23c 100644
--- a/doc/src/snippets/moc/myclass2.h
+++ b/doc/src/snippets/moc/myclass2.h
@@ -58,8 +58,11 @@ public:
     MyClass(QObject *parent = 0);
     ~MyClass();
 
-    void setPriority(Priority priority);
-    Priority priority() const;
+    void setPriority(Priority priority) { m_priority = priority; }
+    Priority priority() const { return m_priority; }
+
+private:
+    Priority m_priority;
 };
 //! [0]
 
diff --git a/doc/src/snippets/threads/threads.cpp b/doc/src/snippets/threads/threads.cpp
index d8d1270..d16c398 100644
--- a/doc/src/snippets/threads/threads.cpp
+++ b/doc/src/snippets/threads/threads.cpp
@@ -93,15 +93,12 @@ private:
 typedef int SomeClass;
 
 //! [7]
-QThreadStorage<QCache<QString, SomeClass> *> caches;
+QThreadStorage<QCache<QString, SomeClass> > caches;
 
 void cacheObject(const QString &key, SomeClass *object)
 //! [7] //! [8]
 {
-    if (!caches.hasLocalData())
-        caches.setLocalData(new QCache<QString, SomeClass>);
-
-    caches.localData()->insert(key, object);
+    caches.localData().insert(key, object);
 }
 
 void removeFromCache(const QString &key)
@@ -110,7 +107,7 @@ void removeFromCache(const QString &key)
     if (!caches.hasLocalData())
         return;
 
-    caches.localData()->remove(key);
+    caches.localData().remove(key);
 }
 //! [9]