From eb845bcc8903ea564fa981e783c7f266287ff049 Mon Sep 17 00:00:00 2001
From: Alessandro Portale <alessandro.portale@nokia.com>
Date: Wed, 22 Sep 2010 14:18:27 +0200
Subject: [PATCH] New Qml app wizard: generate 'main.qml' instead of
'<project>.qml'
Some people were confused that the main .qml file would have a
distinct name.
---
.../templates/qmlapp/qml/app/{app.qml => main.qml} | 0
.../qt4projectmanager/wizards/qmlstandaloneapp.cpp | 8 ++++----
2 files changed, 4 insertions(+), 4 deletions(-)
rename share/qtcreator/templates/qmlapp/qml/app/{app.qml => main.qml} (100%)
diff --git a/share/qtcreator/templates/qmlapp/qml/app/app.qml b/share/qtcreator/templates/qmlapp/qml/app/main.qml
similarity index 100%
rename from share/qtcreator/templates/qmlapp/qml/app/app.qml
rename to share/qtcreator/templates/qmlapp/qml/app/main.qml
diff --git a/src/plugins/qt4projectmanager/wizards/qmlstandaloneapp.cpp b/src/plugins/qt4projectmanager/wizards/qmlstandaloneapp.cpp
index 0bae8ed5376..0a2daa6cc73 100644
--- a/src/plugins/qt4projectmanager/wizards/qmlstandaloneapp.cpp
+++ b/src/plugins/qt4projectmanager/wizards/qmlstandaloneapp.cpp
@@ -164,16 +164,16 @@ QString QmlStandaloneApp::pathExtended(int fileType) const
+ (useExistingMainQml() ? m_mainQmlFile.dir().dirName() : projectName())
+ QLatin1Char('/');
const QString appViewerTargetSubDir = appViewerOriginsSubDir;
- const QString qmlExtension = QLatin1String(".qml");
+ const QString mainQml = QLatin1String("main.qml");
const QString pathBase = outputPathBase();
const QDir appProFilePath(pathBase);
switch (fileType) {
case MainQml: return useExistingMainQml() ? m_mainQmlFile.canonicalFilePath()
- : pathBase + qmlSubDir + projectName() + qmlExtension;
+ : pathBase + qmlSubDir + mainQml;
case MainQmlDeployed: return useExistingMainQml() ? qmlSubDir + m_mainQmlFile.fileName()
- : QString(qmlSubDir + projectName() + qmlExtension);
- case MainQmlOrigin: return originsRoot() + QLatin1String("qml/app/app.qml");
+ : QString(qmlSubDir + mainQml);
+ case MainQmlOrigin: return originsRoot() + QLatin1String("qml/app/") + mainQml;
case AppViewerPri: return pathBase + appViewerTargetSubDir + appViewerPriFileName;
case AppViewerPriOrigin: return originsRoot() + appViewerOriginsSubDir + appViewerPriFileName;
case AppViewerCpp: return pathBase + appViewerTargetSubDir + appViewerCppFileName;
--
GitLab