Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7

Conflicts:
	src/imports/folderlistmodel/qdeclarativefolderlistmodel.cpp
	src/imports/folderlistmodel/qdeclarativefolderlistmodel.h

2 files changed, 62 insertions, 18 deletions

diff --git a/doc/src/examples/qml-examples.qdoc b/doc/src/examples/qml-examples.qdoc
index 22113ee..2973d8c 100644
--- a/doc/src/examples/qml-examples.qdoc
+++ b/doc/src/examples/qml-examples.qdoc
@@ -88,13 +88,13 @@
 */
 
 /*!
-    \title QtWidgets
-    \example declarative/cppextensions/proxywidgets
+    \title QGraphicsLayouts
+    \example declarative/cppextensions/qgraphicslayouts
 */
 
 /*!
-    \title QGraphicsLayouts
-    \example declarative/cppextensions/qgraphicslayouts
+    \title QWidgets
+    \example declarative/cppextensions/qwidgets
 */
 
 /*!
@@ -104,7 +104,7 @@
 
 /*!
     \title Network access manager
-    \example declarative/cppextensions/proxyviewer
+    \example declarative/cppextensions/networkaccessmanagerfactory
 */
 
 /*!
@@ -175,7 +175,7 @@
 */
 
 /*!
-    \title Threaded ListModel 
+    \title Threaded ListModel
     \example declarative/threading/threadedlistmodel
 */
 
@@ -192,6 +192,11 @@
 */
 
 /*!
+    \title Corkboards
+    \example declarative/toys/corkboards
+*/
+
+/*!
     \title Dial
     \example declarative/toys/dial
 
@@ -199,8 +204,8 @@
 */
 
 /*!
-    \title Dynamic
-    \example declarative/toys/dynamic
+    \title Dynamic Scene
+    \example declarative/toys/dynamicscene
 
     This example shows how to create dynamic objects QML.
 */
@@ -216,11 +221,6 @@
 */
 
 /*!
-    \title Velocity
-    \example declarative/toys/velocity
-*/
-
-/*!
     \title Gestures
     \example declarative/touchinteraction/gestures
 */
@@ -268,11 +268,6 @@
 */
 
 /*!
-    \title XML Data
-    \example declarative/xml/xmldata
-*/
-
-/*!
     \title XMLHttpRequest
     \example declarative/xml/xmlhttprequest
 */
diff --git a/doc/src/examples/qml-rssnews.qdoc b/doc/src/examples/qml-rssnews.qdoc
new file mode 100644
index 0000000..0e7bdef
--- /dev/null
+++ b/doc/src/examples/qml-rssnews.qdoc
@@ -0,0 +1,49 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \title RSS News
+    \example demos/declarative/rssnews
+
+    This demo shows how to write a RSS news reader in QML.
+
+    \image qml-rssnews-example.png
+*/