From b7ae49161a9c0f64bfa70e1b3c95d55ed8e7441f Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Mon, 7 Jun 2010 13:42:27 +0200 Subject: [PATCH] Revert disabling of qml support (2.0.0 branch) This reverts commit 5234c775f765a and 210652912b728e9c. --- qtcreator.pri | 6 ----- src/plugins/plugins.pro | 27 ++++++++----------- src/plugins/qmljseditor/qmljseditorplugin.cpp | 2 -- .../qmlprojectmanager/qmlprojectplugin.cpp | 2 -- .../gettingstartedwelcomepagewidget.cpp | 6 ----- .../gettingstartedwelcomepagewidget.ui | 4 +-- 6 files changed, 13 insertions(+), 34 deletions(-) diff --git a/qtcreator.pri b/qtcreator.pri index 73b2e73d8bb..b4ca541b0f2 100644 --- a/qtcreator.pri +++ b/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 -} diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro index e358fa1af05..156d5ce9f8f 100644 --- a/src/plugins/plugins.pro +++ b/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) { - message("Adding support for QmlDesigner, QmlInspector and Qml wizards.") - - include(private_headers.pri) - exists($${QT_PRIVATE_HEADERS}/QtDeclarative/private/qdeclarativecontext_p.h) { - SUBDIRS += plugin_qmldesigner \ - plugin_qmlinspector - } else { - warning() - warning("QmlDesigner and QmlInspector plugins have been disabled") - 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() - } + include(private_headers.pri) + exists($${QT_PRIVATE_HEADERS}/QtDeclarative/private/qdeclarativecontext_p.h) { + SUBDIRS += plugin_qmldesigner \ + plugin_qmlinspector + } else { + warning() + warning("QmlDesigner and QmlInspector plugins have been disabled") + 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() } } diff --git a/src/plugins/qmljseditor/qmljseditorplugin.cpp b/src/plugins/qmljseditor/qmljseditorplugin.cpp index 20ae4bf1151..f998309ac17 100644 --- a/src/plugins/qmljseditor/qmljseditorplugin.cpp +++ b/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 diff --git a/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp b/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp index 3a321bfc8fa..144d5d00880 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp +++ b/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(); diff --git a/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp b/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp index a7bd0b369be..1e82fc64e0e 100644 --- a/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp +++ b/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(); diff --git a/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.ui b/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.ui index 833f644622a..9f03d493557 100644 --- a/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.ui +++ b/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.ui @@ -119,7 +119,7 @@ - + 0 @@ -137,7 +137,7 @@ - + Explore Qt Quick Examples