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

Merge remote branch 'origin/2.0'

Browse Source 
Conflicts:
	src/plugins/debugger/debuggeruiswitcher.cpp
	src/plugins/git/gitclient.cpp
	src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
This commit is contained in:
Friedemann Kleint
2010-08-06 10:46:50 +02:00
parent 077c918186 9bad0c01be
commit 7e739985b2
24 changed files with 316 additions and 4399 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
View File

@@ -63,9 +63,10 @@ Core::BaseFileWizardParameters QmlProjectApplicationWizard::parameters()
Core::BaseFileWizardParameters parameters(ProjectWizard);
parameters.setIcon(QIcon(QLatin1String(Constants::QML_WIZARD_ICON)));
parameters.setDisplayName(tr("Qt QML Application"));
parameters.setDisplayName(tr("QML Application"));
parameters.setId(QLatin1String("QA.QML Application"));
parameters.setDescription(tr("Creates a Qt QML application project with a single QML file containing the main view.\n\n"
"QML application projects are executed through the QML runtime and do not need to be built."));
parameters.setDescription(tr("Creates a QML application project with a single QML file containing the main view.\n\n"
"QML application projects are executed by the Qt QML Viewer and do not need to be built."));
parameters.setCategory(QLatin1String(Constants::QML_WIZARD_CATEGORY));
parameters.setDisplayCategory(QCoreApplication::translate(Constants::QML_WIZARD_TR_SCOPE,
Constants::QML_WIZARD_TR_CATEGORY));