Remove duplicated doc files and images

- Remove doc/ files which were duplicated under src/quick/doc and
  src/qml/doc
- Remove duplicated images under src/doc/qml/images which were already
  under src/doc/quick/images
- Merged 0102413396c91e97ed856235cd1a52f7185c4862 and
  3b04bbde6356797368114fce1b45b85271e9fed8 which made it into doc/src
  but not src/qml/doc

Change-Id: I275b7d29f9fc2222dcf801c257c1f67b5880446b
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>

1 files changed, 12 insertions, 7 deletions

diff --git a/tests/auto/quick/examples/tst_examples.cpp b/tests/auto/quick/examples/tst_examples.cpp
index b019c716b0..7e376b4b4e 100644
--- a/tests/auto/quick/examples/tst_examples.cpp
+++ b/tests/auto/quick/examples/tst_examples.cpp
@@ -89,18 +89,18 @@ private:
 tst_examples::tst_examples() : canvas(0)
 {
     // Add files to exclude here
-    excludedFiles << "doc/src/snippets/qml/listmodel.qml"; //Just a ListModel, no root QQuickItem
+    excludedFiles << "snippets/qml/listmodel.qml"; //Just a ListModel, no root QQuickItem
 
     // Add directories you want excluded here (don't add examples/, because they install to examples/qtdeclarative/)
     excludedDirs << "shared"; //Not an example
     excludedDirs << "qtquick/text/fonts"; // QTBUG-21415
-    excludedDirs << "doc/src/snippets/qml/path"; //No root QQuickItem
+    excludedDirs << "snippets/qml/path"; //No root QQuickItem
     excludedDirs << "tutorials/gettingStartedQml"; //C++ example, but no cpp files in root dir
 
     // These snippets are not expected to run on their own.
-    excludedDirs << "doc/src/snippets/qml/visualdatamodel_rootindex";
-    excludedDirs << "doc/src/snippets/qml/qtbinding";
-    excludedDirs << "doc/src/snippets/qml/imports";
+    excludedDirs << "snippets/qml/visualdatamodel_rootindex";
+    excludedDirs << "snippets/qml/qtbinding";
+    excludedDirs << "snippets/qml/imports";
 
 #ifdef QT_NO_WEBKIT
     excludedDirs << "qtquick/modelviews/webview";
@@ -112,6 +112,7 @@ tst_examples::tst_examples() : canvas(0)
     excludedDirs << "demos/twitter";
     excludedDirs << "demos/flickr";
     excludedDirs << "demos/photoviewer";
+    excludedDirs << "snippets/qml/xmlrole.qml";
 #endif
 
     // QTBUG-24034 - don't run customparticle examples
@@ -276,11 +277,15 @@ void tst_examples::sgsnippets_data()
 {
     QTest::addColumn<QString>("file");
 
-    QString snippets = QLatin1String(SRCDIR) + "/../../../../doc/src/snippets/qml";
-
+    QString snippets = QLatin1String(SRCDIR) + "/../../../../src/qml/doc/snippets/qml";
     QStringList files;
     files << findQmlFiles(QDir(snippets));
+    foreach (const QString &file, files)
+        QTest::newRow(qPrintable(file)) << file;
 
+    snippets = QLatin1String(SRCDIR) + "/../../../../src/quick/doc/snippets/qml";
+    files.clear();
+    files << findQmlFiles(QDir(snippets));
     foreach (const QString &file, files)
         QTest::newRow(qPrintable(file)) << file;
 }