diff --git a/share/qtcreator/templates/qmlapp/main.cpp b/share/qtcreator/templates/qmlapp/main.cpp index 8ca2cd039540308469432ec05663e1673002906b..2f61e179a90718cdb1ce3031449821727467dc2d 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 866f3d7baab95fada17ea26466815cc1a1988023..3ddb72003a2b07115cdca17256c0807b4039e3ea 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 bc70e2e5730e98265b248d49532ad3df7d08134a..e051961dc54d49d7d23618bcf342151006bf10b3 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 2977cde7dcda0b93e2a56b6920693e2b6a472867..0bae8ed53761b71de02d9889f403e5f177e1e702 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; }