diff --git a/share/qtcreator/templates/qmlapp/cpp/main.cpp b/share/qtcreator/templates/qmlapp/cpp/main.cpp index c37bbb96ee7..e4cf9ded8e2 100644 --- a/share/qtcreator/templates/qmlapp/cpp/main.cpp +++ b/share/qtcreator/templates/qmlapp/cpp/main.cpp @@ -8,7 +8,7 @@ int main(int argc, char *argv[]) QmlApplicationView qmlApp; qmlApp.addImportPath(QLatin1String("modules")); // ADDIMPORTPATH qmlApp.setOrientation(QmlApplicationView::Auto); // ORIENTATION - qmlApp.setMainQml(QLatin1String("qml/app/app.qml")); // MAINQML + qmlApp.setMainQmlFile(QLatin1String("qml/app/app.qml")); // MAINQML qmlApp.setLoadDummyData(false); // LOADDUMMYDATA #ifdef Q_OS_SYMBIAN diff --git a/share/qtcreator/templates/qmlapp/cpp/qmlapplicationview.cpp b/share/qtcreator/templates/qmlapp/cpp/qmlapplicationview.cpp index a33b3a95dae..d72087cdd9a 100644 --- a/share/qtcreator/templates/qmlapp/cpp/qmlapplicationview.cpp +++ b/share/qtcreator/templates/qmlapp/cpp/qmlapplicationview.cpp @@ -48,15 +48,15 @@ QmlApplicationView::~QmlApplicationView() delete m_d; } -void QmlApplicationView::setMainQml(const QString &mainQml) +void QmlApplicationView::setMainQmlFile(const QString &file) { - m_d->mainQmlFile = QmlApplicationViewPrivate::adjustPath(mainQml); + m_d->mainQmlFile = QmlApplicationViewPrivate::adjustPath(file); setSource(QUrl::fromLocalFile(m_d->mainQmlFile)); } -void QmlApplicationView::addImportPath(const QString &importPath) +void QmlApplicationView::addImportPath(const QString &path) { - engine()->addImportPath(QmlApplicationViewPrivate::adjustPath(importPath)); + engine()->addImportPath(QmlApplicationViewPrivate::adjustPath(path)); } void QmlApplicationView::setOrientation(Orientation orientation) diff --git a/share/qtcreator/templates/qmlapp/cpp/qmlapplicationview.h b/share/qtcreator/templates/qmlapp/cpp/qmlapplicationview.h index 2488a96e145..1c07330d869 100644 --- a/share/qtcreator/templates/qmlapp/cpp/qmlapplicationview.h +++ b/share/qtcreator/templates/qmlapp/cpp/qmlapplicationview.h @@ -19,8 +19,8 @@ public: QmlApplicationView(QWidget *parent = 0); virtual ~QmlApplicationView(); - void setMainQml(const QString &mainQml); - void addImportPath(const QString &importPath); + void setMainQmlFile(const QString &file); + void addImportPath(const QString &path); void setOrientation(Orientation orientation); void setLoadDummyData(bool loadDummyData);