feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QML wizard: Remove remains of dummy data loading.

Browse Source 
The GUI part of this has been removed already.

Reviewed-by: Alessandro Portale
This commit is contained in:
Christian Kandeler
2010-09-21 16:31:51 +02:00
parent 78ea4d2d2f
commit 1507b5b4e1
4 changed files with 0 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
share/qtcreator/templates/qmlapp/main.cpp
View File

@@ -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();

21
share/qtcreator/templates/qmlapp/qmlapplicationviewer/qmlapplicationviewer.cpp
View File

@@ -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

1
share/qtcreator/templates/qmlapp/qmlapplicationviewer/qmlapplicationviewer.h
View File

@@ -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:

2
src/plugins/qt4projectmanager/wizards/qmlstandaloneapp.cpp
View File

@@ -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;
}