feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Disable everything QML-related but QMLJSEditor by default

Browse Source 
To get QML functionality back, export QTCREATOR_WITH_QML before
running qmake

Reviewed-by: Kai Koehne
This commit is contained in:
Daniel Molkentin
2010-06-01 12:51:18 +02:00
parent 52fce25de3
commit 210652912b
3 changed files with 29 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/plugins.pro
View File

@@ -35,6 +35,12 @@ SUBDIRS = plugin_coreplugin \
plugin_mercurial \
debugger/dumper.pro
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
@@ -51,6 +57,7 @@ contains(QT_CONFIG, declarative) {
warning()
}
}
}
plugin_coreplugin.subdir = coreplugin

7
src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp
View File

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

4
src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.ui
View File

@@ -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>