forked from qt-creator/qt-creator
Disable everything QML-related but QMLJSEditor by default
To get QML functionality back, export QTCREATOR_WITH_QML before running qmake Reviewed-by: Kai Koehne
This commit is contained in:
@@ -35,6 +35,12 @@ SUBDIRS = plugin_coreplugin \
|
|||||||
plugin_mercurial \
|
plugin_mercurial \
|
||||||
debugger/dumper.pro
|
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) {
|
contains(QT_CONFIG, declarative) {
|
||||||
|
|
||||||
SUBDIRS += plugin_qmlprojectmanager
|
SUBDIRS += plugin_qmlprojectmanager
|
||||||
@@ -51,6 +57,7 @@ contains(QT_CONFIG, declarative) {
|
|||||||
warning()
|
warning()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
plugin_coreplugin.subdir = coreplugin
|
plugin_coreplugin.subdir = coreplugin
|
||||||
|
|
||||||
|
|||||||
@@ -66,6 +66,11 @@ GettingStartedWelcomePageWidget::GettingStartedWelcomePageWidget(QWidget *parent
|
|||||||
ui(new Ui::GettingStartedWelcomePageWidget)
|
ui(new Ui::GettingStartedWelcomePageWidget)
|
||||||
{
|
{
|
||||||
ui->setupUi(this);
|
ui->setupUi(this);
|
||||||
|
|
||||||
|
#ifndef QTCREATOR_WITH_QML
|
||||||
|
ui->demosExamplesFrameQml->hide();
|
||||||
|
#endif
|
||||||
|
|
||||||
ui->didYouKnowTextBrowser->viewport()->setAutoFillBackground(false);
|
ui->didYouKnowTextBrowser->viewport()->setAutoFillBackground(false);
|
||||||
|
|
||||||
connect(ui->tutorialTreeWidget, SIGNAL(activated(QString)), SLOT(slotOpenHelpPage(const QString&)));
|
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"));
|
QLatin1String("qthelp://com.nokia.qtcreator/doc/creator-writing-program.html?view=split"));
|
||||||
ui->tutorialTreeWidget->addItem(tr("Creating a Mobile Application"),
|
ui->tutorialTreeWidget->addItem(tr("Creating a Mobile Application"),
|
||||||
QLatin1String("qthelp://com.nokia.qtcreator/doc/creator-mobile-example?view=split"));
|
QLatin1String("qthelp://com.nokia.qtcreator/doc/creator-mobile-example?view=split"));
|
||||||
|
#ifdef QTCREATOR_WITH_QML
|
||||||
ui->tutorialTreeWidget->addItem(tr("Creating a Qt Quick Application"),
|
ui->tutorialTreeWidget->addItem(tr("Creating a Qt Quick Application"),
|
||||||
QLatin1String("qthelp://com.nokia.qtcreator/doc/creator-qml-application.html?view=split"));
|
QLatin1String("qthelp://com.nokia.qtcreator/doc/creator-qml-application.html?view=split"));
|
||||||
|
#endif
|
||||||
|
|
||||||
srand(QDateTime::currentDateTime().toTime_t());
|
srand(QDateTime::currentDateTime().toTime_t());
|
||||||
QStringList tips = tipsOfTheDay();
|
QStringList tips = tipsOfTheDay();
|
||||||
|
|||||||
@@ -117,7 +117,7 @@
|
|||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="1" column="1">
|
<item row="1" column="1">
|
||||||
<widget class="QFrame" name="demosExamplesFrame_2">
|
<widget class="QFrame" name="demosExamplesFrameQml">
|
||||||
<property name="sizePolicy">
|
<property name="sizePolicy">
|
||||||
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
|
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
|
||||||
<horstretch>0</horstretch>
|
<horstretch>0</horstretch>
|
||||||
@@ -135,7 +135,7 @@
|
|||||||
</property>
|
</property>
|
||||||
<layout class="QVBoxLayout" name="verticalLayout_3">
|
<layout class="QVBoxLayout" name="verticalLayout_3">
|
||||||
<item>
|
<item>
|
||||||
<widget class="Utils::WelcomeModeLabel" name="demoTitleLabel_2">
|
<widget class="Utils::WelcomeModeLabel" name="demoTitleLabeldemosExamplesFrameQml">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Explore Qt Quick (Preview) Examples</string>
|
<string>Explore Qt Quick (Preview) Examples</string>
|
||||||
</property>
|
</property>
|
||||||
|
|||||||
Reference in New Issue
Block a user