QmlSupport: Show wizards in 'other' category

Enable Qml project related wizards again, but move them to the
"Other Projects" category. We originally disabled them completely
because we want to make Qml Support fully available only with 2.1.
However, for current users it's just weird that they can _open_ a
qmlproject file, but not generate it.

Reviewed-by: Friedemann Kleint
Reviewed-by: dt

share/qtcreator/templates/wizards/qml-extension/wizard.xml

@@ -36,7 +36,7 @@ leave room for the Qt 4 target page.
 -->
 <wizard version="1" kind="project"
         class="qt4project" firstpage="10"
-        id="QmlExtensionPlugin" category="F.Projects" enabled="false">
+        id="QmlExtensionPlugin" category="I.Projects" enabled="true">
     <icon>lib.png</icon>
     <description>Creates a C++ plugin that makes it possible to offer extensions that can be loaded dynamically into applications using the QDeclarativeEngine class.</description>
     <displayname>Custom QML Extension Plugin</displayname>

src/plugins/plugins.pro

@@ -41,7 +41,7 @@ contains(QT_CONFIG, declarative) {
     SUBDIRS += plugin_qmlprojectmanager
 
     !isEmpty(SUPPORT_QT_QML) {
-        message("Adding support for QmlDesigner, QmlInspector and Qml wizards.")
+        message("Adding support for QmlInspector.")
     }
 
     include(private_headers.pri)

src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp

@@ -31,6 +31,7 @@
 
 #include "qmlprojectconstants.h"
 
+#include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/customwizard/customwizard.h>
 
 #include <QtGui/QIcon>
@@ -73,7 +74,11 @@ Core::BaseFileWizardParameters QmlProjectApplicationWizard::parameters()
     parameters.setId(QLatin1String("QA.QML Application"));
     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."));
+#ifdef QTCREATOR_WITH_QML
     parameters.setCategory(QLatin1String(Constants::QML_WIZARD_CATEGORY));
+#else
+    parameters.setCategory(QLatin1String(ProjectExplorer::Constants::PROJECT_WIZARD_CATEGORY));
+#endif
     parameters.setDisplayCategory(QCoreApplication::translate(Constants::QML_WIZARD_TR_SCOPE,
                                                               Constants::QML_WIZARD_TR_CATEGORY));
     return parameters;

src/plugins/qmlprojectmanager/qmlprojectimportwizard.cpp

@@ -33,6 +33,7 @@
 
 #include <coreplugin/icore.h>
 #include <coreplugin/mimedatabase.h>
+#include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/customwizard/customwizard.h>
 
 #include <utils/filenamevalidatinglineedit.h>
@@ -116,7 +117,11 @@ Core::BaseFileWizardParameters QmlProjectImportWizard::parameters()
     parameters.setDisplayName(tr("Import Existing QML Directory"));
     parameters.setId(QLatin1String("QI.QML Import"));
     parameters.setDescription(tr("Creates a QML project from an existing directory of QML files."));
+#ifdef QTCREATOR_WITH_QML
     parameters.setCategory(QLatin1String(Constants::QML_WIZARD_CATEGORY));
+#else
+    parameters.setCategory(QLatin1String(ProjectExplorer::Constants::PROJECT_WIZARD_CATEGORY));
+#endif
     parameters.setDisplayCategory(QCoreApplication::translate(Constants::QML_WIZARD_TR_SCOPE,
                                                               Constants::QML_WIZARD_TR_CATEGORY));
     return parameters;

src/plugins/qmlprojectmanager/qmlprojectplugin.cpp

@@ -82,10 +82,8 @@ bool QmlProjectPlugin::initialize(const QStringList &, QString *errorMessage)
     addAutoReleasedObject(manager);
     addAutoReleasedObject(new Internal::QmlProjectRunConfigurationFactory);
     addAutoReleasedObject(new Internal::QmlRunControlFactory);
-#ifdef QTCREATOR_WITH_QML
     addAutoReleasedObject(new QmlProjectApplicationWizard);
     addAutoReleasedObject(new QmlProjectImportWizard);
-#endif
 
     QmlProjectFileFormat::registerDeclarativeTypes();