From 1507b5b4e184555759816c00c7413b6e29792b81 Mon Sep 17 00:00:00 2001
From: Christian Kandeler <christian.kandeler@nokia.com>
Date: Tue, 21 Sep 2010 16:31:51 +0200
Subject: [PATCH] QML wizard: Remove remains of dummy data loading.

The GUI part of this has been removed already.

Reviewed-by: Alessandro Portale
---
 share/qtcreator/templates/qmlapp/main.cpp     |  1 -
 .../qmlapplicationviewer.cpp                  | 21 -------------------
 .../qmlapplicationviewer.h                    |  1 -
 .../wizards/qmlstandaloneapp.cpp              |  2 --
 4 files changed, 25 deletions(-)

diff --git a/share/qtcreator/templates/qmlapp/main.cpp b/share/qtcreator/templates/qmlapp/main.cpp
index 8ca2cd03954..2f61e179a90 100644
--- a/share/qtcreator/templates/qmlapp/main.cpp
+++ b/share/qtcreator/templates/qmlapp/main.cpp
@@ -9,7 +9,6 @@ int main(int argc, char *argv[])
     viewer.addImportPath(QLatin1String("modules")); // ADDIMPORTPATH
     viewer.setOrientation(QmlApplicationViewer::Auto); // ORIENTATION
     viewer.setMainQmlFile(QLatin1String("qml/app/app.qml")); // MAINQML
-    viewer.setLoadDummyData(false); // LOADDUMMYDATA
     viewer.show();
 
     return app.exec();
diff --git a/share/qtcreator/templates/qmlapp/qmlapplicationviewer/qmlapplicationviewer.cpp b/share/qtcreator/templates/qmlapp/qmlapplicationviewer/qmlapplicationviewer.cpp
index 866f3d7baab..3ddb72003a2 100644
--- a/share/qtcreator/templates/qmlapp/qmlapplicationviewer/qmlapplicationviewer.cpp
+++ b/share/qtcreator/templates/qmlapp/qmlapplicationviewer/qmlapplicationviewer.cpp
@@ -108,27 +108,6 @@ void QmlApplicationViewer::setOrientation(Orientation orientation)
 #endif // Q_OS_SYMBIAN
 }
 
-void QmlApplicationViewer::setLoadDummyData(bool loadDummyData)
-{
-    if (loadDummyData) {
-        const QFileInfo mainQmlFileInfo(m_d->mainQmlFile);
-        const QDir dir(mainQmlFileInfo.absolutePath() + QLatin1String("/dummydata"),
-                 QLatin1String("*.qml"));
-        foreach (const QFileInfo &qmlFile, dir.entryInfoList()) {
-            QFile f(qmlFile.absoluteFilePath());
-            if (f.open(QIODevice::ReadOnly)) {
-                QDeclarativeComponent comp(engine());
-                comp.setData(f.readAll(), QUrl());
-                QObject *dummyData = comp.create();
-                if (dummyData) {
-                    rootContext()->setContextProperty(qmlFile.baseName(), dummyData);
-                    dummyData->setParent(this);
-                }
-            }
-        }
-    }
-}
-
 void QmlApplicationViewer::show()
 {
 #ifdef Q_OS_SYMBIAN
diff --git a/share/qtcreator/templates/qmlapp/qmlapplicationviewer/qmlapplicationviewer.h b/share/qtcreator/templates/qmlapp/qmlapplicationviewer/qmlapplicationviewer.h
index bc70e2e5730..e051961dc54 100644
--- a/share/qtcreator/templates/qmlapp/qmlapplicationviewer/qmlapplicationviewer.h
+++ b/share/qtcreator/templates/qmlapp/qmlapplicationviewer/qmlapplicationviewer.h
@@ -18,7 +18,6 @@ public:
     void setMainQmlFile(const QString &file);
     void addImportPath(const QString &path);
     void setOrientation(Orientation orientation);
-    void setLoadDummyData(bool loadDummyData);
     void show();
 
 private:
diff --git a/src/plugins/qt4projectmanager/wizards/qmlstandaloneapp.cpp b/src/plugins/qt4projectmanager/wizards/qmlstandaloneapp.cpp
index 2977cde7dcd..0bae8ed5376 100644
--- a/src/plugins/qt4projectmanager/wizards/qmlstandaloneapp.cpp
+++ b/src/plugins/qt4projectmanager/wizards/qmlstandaloneapp.cpp
@@ -210,8 +210,6 @@ bool QmlStandaloneApp::adaptCurrentMainCppTemplateLine(QString &line) const
             adaptLine = false;
         else
             insertParameter(line, quote + path(ModulesDir) + quote);
-    } else if (line.contains(QLatin1String("// LOADDUMMYDATA"))) {
-        adaptLine = false;
     }
     return adaptLine;
 }