diff options
author | Daniel Molkentin <daniel.molkentin@nokia.com> | 2010-06-01 12:51:18 +0200 |
---|---|---|
committer | hjk <qtc-committer@nokia.com> | 2010-06-01 14:34:22 +0200 |
commit | e922616fdcbd65ee5f9636a57b1adf38d3566c25 (patch) | |
tree | 87fa07dd8fd092c09f054fa2c2fb7dd6e661b28c | |
parent | 57a880e4af93b388bdc2c51222a4414ecff6e4de (diff) |
Disable everything QML-related but QMLJSEditor by default
To get QML functionality back, export QTCREATOR_WITH_QML before
running qmake
Reviewed-by: Kai Koehne
(cherry picked from commit 210652912b728e9c00fbb39290ee619c92fc9799)
-rw-r--r-- | src/plugins/plugins.pro | 37 | ||||
-rw-r--r-- | src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp | 7 | ||||
-rw-r--r-- | src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.ui | 4 |
3 files changed, 31 insertions, 17 deletions
diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro index 156d5ce9f8..c8bbb792ed 100644 --- a/src/plugins/plugins.pro +++ b/src/plugins/plugins.pro @@ -35,21 +35,28 @@ SUBDIRS = plugin_coreplugin \ plugin_mercurial \ debugger/dumper.pro -contains(QT_CONFIG, declarative) { - - SUBDIRS += plugin_qmlprojectmanager - - 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() - } +SUPPORT_QT_QML = $$(QTCREATOR_WITH_QML) + +!isEmpty(SUPPORT_QT_QML) { + message("Adding support for Qt/QML projects.") + DEFINES += QTCREATOR_WITH_QML + + contains(QT_CONFIG, declarative) { + + SUBDIRS += plugin_qmlprojectmanager + + 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() + } + } } plugin_coreplugin.subdir = coreplugin diff --git a/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp b/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp index e9491bdca1..f19b69ebbb 100644 --- a/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp +++ b/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp @@ -66,6 +66,11 @@ GettingStartedWelcomePageWidget::GettingStartedWelcomePageWidget(QWidget *parent ui(new Ui::GettingStartedWelcomePageWidget) { 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&))); @@ -78,8 +83,10 @@ 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?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 a46f113acc..10b5ba035d 100644 --- a/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.ui +++ b/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.ui @@ -117,7 +117,7 @@ </widget> </item> <item row="1" column="1"> - <widget class="QFrame" name="demosExamplesFrame_2"> + <widget class="QFrame" name="demosExamplesFrameQml"> <property name="sizePolicy"> <sizepolicy hsizetype="Preferred" vsizetype="Maximum"> <horstretch>0</horstretch> @@ -135,7 +135,7 @@ </property> <layout class="QVBoxLayout" name="verticalLayout_3"> <item> - <widget class="Utils::WelcomeModeLabel" name="demoTitleLabel_2"> + <widget class="Utils::WelcomeModeLabel" name="demoTitleLabeldemosExamplesFrameQml"> <property name="text"> <string>Explore Qt Quick (Preview) Examples</string> </property> |