Commit 4565bc74 authored by Alessandro Portale's avatar Alessandro Portale
Browse files

Move qml app templates from .qrc to share/qtcreator/templates

Makes development easier (no recompiling needed when tweaking the
templates). Also, all other templates are in that folder.
parent 7ff7878c
......@@ -4,11 +4,5 @@
<file>images/qmlfolder.png</file>
<file>images/qmlproject.png</file>
<file>images/qml_wizard.png</file>
<file>wizards/templates/app.pro</file>
<file>wizards/templates/qml/app/app.qml</file>
<file>wizards/templates/cpp/qmlapplicationview.h</file>
<file>wizards/templates/cpp/symbianicon.svg</file>
<file>wizards/templates/cpp/main.cpp</file>
<file>wizards/templates/cpp/qmlapplicationview.cpp</file>
</qresource>
</RCC>
......@@ -34,6 +34,10 @@
#include <QtCore/QRegExp>
#include <QtCore/QTextStream>
#ifndef CREATORLESSTEST
#include <coreplugin/icore.h>
#endif // CREATORLESSTEST
namespace QmlProjectManager {
namespace Internal {
......@@ -136,7 +140,11 @@ QString QmlStandaloneApp::path(Path path, Location location) const
const QString qmlRootFolder = QLatin1String("qml/")
+ (useExistingMainQml() ? m_mainQmlFile.dir().dirName() : m_projectName)
+ QLatin1Char('/');
#ifdef CREATORLESSTEST
const QString sourceRoot = QLatin1String(":/qmlproject/wizards/templates/");
#else // CREATORLESSTEST
const QString sourceRoot = Core::ICore::instance()->resourcePath() + QLatin1String("/templates/qmlapp/");
#endif // CREATORLESSTEST
const QString cppSourceSubDir = QLatin1String("cpp/");
const QString cppTargetSubDir = cppSourceSubDir;
const QString qmlExtension = QLatin1String(".qml");
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment