Revert disabling of qml support (2.0.0 branch)

This reverts commit 5234c775f7 and 210652912b.

qtcreator.pri

@@ -117,9 +117,3 @@ win32-msvc* {
 # Handle S60 support: default on Windows, conditionally built on other platforms.
 macx:SUPPORT_QT_S60 = $$(QTCREATOR_WITH_S60)
 else:SUPPORT_QT_S60=1
-
-# Define QTCREATOR_WITH_QML if building with Qml support
-SUPPORT_QT_QML = $$(QTCREATOR_WITH_QML)
-!isEmpty(SUPPORT_QT_QML) {
-    DEFINES += QTCREATOR_WITH_QML
-}

src/plugins/plugins.pro

@@ -35,25 +35,20 @@ SUBDIRS   = plugin_coreplugin \
             plugin_mercurial \
             debugger/dumper.pro
 
-SUPPORT_QT_QML = $$(QTCREATOR_WITH_QML)
-
 contains(QT_CONFIG, declarative) {
+
     SUBDIRS += plugin_qmlprojectmanager
 
-    !isEmpty(SUPPORT_QT_QML) {
+    include(private_headers.pri)
-        message("Adding support for QmlDesigner, QmlInspector and Qml wizards.")
+    exists($${QT_PRIVATE_HEADERS}/QtDeclarative/private/qdeclarativecontext_p.h) {
-
+        SUBDIRS += plugin_qmldesigner \
-        include(private_headers.pri)
+                   plugin_qmlinspector
-        exists($${QT_PRIVATE_HEADERS}/QtDeclarative/private/qdeclarativecontext_p.h) {
+    } else {
-            SUBDIRS += plugin_qmldesigner \
+        warning()
-                       plugin_qmlinspector
+        warning("QmlDesigner and QmlInspector plugins have been disabled")
-        } else {
+        warning("The plugins depend on on private headers from QtDeclarative module.")
-            warning()
+        warning("To enable them, pass 'QT_PRIVATE_HEADERS=$QTDIR/include' to qmake, where $QTDIR is the source directory of qt.")
-            warning("QmlDesigner and QmlInspector plugins have been disabled")
+        warning()
-            warning("The plugins depend on on private headers from QtDeclarative module.")
-            warning("To enable them, pass 'QT_PRIVATE_HEADERS=$QTDIR/include' to qmake, where $QTDIR is the source directory of qt.")
-            warning()
-        }
     }
 }
 

src/plugins/qmljseditor/qmljseditorplugin.cpp

@@ -105,7 +105,6 @@ bool QmlJSEditorPlugin::initialize(const QStringList & /*arguments*/, QString *e
     m_editor = new QmlJSEditorFactory(this);
     addObject(m_editor);
 
-#ifdef QTCREATOR_WITH_QML
     Core::BaseFileWizardParameters wizardParameters(Core::IWizard::FileWizard);
     wizardParameters.setCategory(QLatin1String(Core::Constants::WIZARD_CATEGORY_QT));
     wizardParameters.setDisplayCategory(QCoreApplication::translate("Core", Core::Constants::WIZARD_TR_CATEGORY_QT));
@@ -113,7 +112,6 @@ bool QmlJSEditorPlugin::initialize(const QStringList & /*arguments*/, QString *e
     wizardParameters.setDisplayName(tr("Qt QML File"));
     wizardParameters.setId(QLatin1String("Q.Qml"));
     addAutoReleasedObject(new QmlFileWizard(wizardParameters, core));
-#endif
 
     m_actionHandler = new TextEditor::TextEditorActionHandler(QmlJSEditor::Constants::C_QMLJSEDITOR_ID,
           TextEditor::TextEditorActionHandler::Format

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();
 

src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp

@@ -67,10 +67,6 @@ GettingStartedWelcomePageWidget::GettingStartedWelcomePageWidget(QWidget *parent
 {
     ui->setupUi(this);
 
-#ifndef QTCREATOR_WITH_QML
-    ui->demosExamplesFrameQml->hide();
-#endif
-
     ui->didYouKnowTextBrowser->viewport()->setAutoFillBackground(false);
 
     connect(ui->tutorialTreeWidget, SIGNAL(activated(QString)), SLOT(slotOpenHelpPage(const QString&)));
@@ -83,10 +79,8 @@ GettingStartedWelcomePageWidget::GettingStartedWelcomePageWidget(QWidget *parent
                                         QLatin1String("qthelp://com.nokia.qtcreator/doc/creator-writing-program.html?view=split"));
     ui->tutorialTreeWidget->addItem(tr("Creating a Mobile Application"),
                                         QLatin1String("qthelp://com.nokia.qtcreator/doc/creator-mobile-example.html?view=split"));
-#ifdef QTCREATOR_WITH_QML
     ui->tutorialTreeWidget->addItem(tr("Creating a Qt Quick Application"),
                                         QLatin1String("qthelp://com.nokia.qtcreator/doc/creator-qml-application.html?view=split"));
-#endif
 
     srand(QDateTime::currentDateTime().toTime_t());
     QStringList tips = tipsOfTheDay();

src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.ui

@@ -119,7 +119,7 @@
        </widget>
       </item>
       <item row="1" column="1">
-       <widget class="QFrame" name="demosExamplesFrameQml">
+       <widget class="QFrame" name="demosExamplesFrame_2">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
           <horstretch>0</horstretch>
@@ -137,7 +137,7 @@
         </property>
         <layout class="QVBoxLayout" name="verticalLayout_3">
          <item>
-          <widget class="Utils::WelcomeModeLabel" name="demoTitleLabeldemosExamplesFrameQml">
+          <widget class="Utils::WelcomeModeLabel" name="demoTitleLabel_2">
            <property name="text">
             <string>Explore Qt Quick Examples</string>
            </property>