Project Wizards: Make the categorie names reflect the contents

Also reorder the contents to have Qt Quick on top. Move Console Qt
to Other Projects.

Qt QWidget project isn't the best name, but the new structure is a
improvement so using it for now.

Task-Nr: QTCREATORBUG-3513

Ack-By: con
Ack-By: kkoehne

src/plugins/qt4projectmanager/wizards/consoleappwizard.cpp

@@ -36,6 +36,7 @@
 #include "consoleappwizarddialog.h"
 #include "qt4projectmanagerconstants.h"
 
+#include <projectexplorer/projectexplorerconstants.h>
 #include <cpptools/abstracteditorsupport.h>
 
 #include <QtGui/QIcon>
@@ -57,9 +58,9 @@ namespace Internal {
 
 ConsoleAppWizard::ConsoleAppWizard()
   : QtWizard(QLatin1String("E.Qt4Core"),
-             QLatin1String(Constants::QT_APP_WIZARD_CATEGORY),
-             QLatin1String(Constants::QT_APP_WIZARD_TR_SCOPE),
-             QLatin1String(Constants::QT_APP_WIZARD_TR_CATEGORY),
+             QLatin1String(ProjectExplorer::Constants::PROJECT_WIZARD_CATEGORY),
+             QLatin1String(ProjectExplorer::Constants::PROJECT_WIZARD_TR_SCOPE),
+             QLatin1String(ProjectExplorer::Constants::PROJECT_WIZARD_TR_CATEGORY),
              tr("Qt Console Application"),
              tr("Creates a project containing a single main.cpp file with a stub implementation.\n\n"
                 "Preselects a desktop Qt for building the application if available."),