diff options
| author | Kai Koehne <kai.koehne@nokia.com> | 2010-08-17 17:14:56 +0200 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@nokia.com> | 2010-08-17 17:18:21 +0200 |
| commit | 8937d933e7e84032be39cc8b08e560e4479db19f (patch) | |
| tree | 6ae711d2dea50b80012ebd25456e6a58c022939d | |
| parent | 013b79c8e81da7cdb719cb8753f00aa5e92690e6 (diff) | |
Compile QmlDesigner even when QTCREATOR_WITH_QML=false
It's disabled anyway.
| -rw-r--r-- | src/plugins/plugins.pro | 14 | ||||
| -rw-r--r-- | src/plugins/qmljseditor/qmljseditorfactory.cpp | 2 |
2 files changed, 11 insertions, 5 deletions
diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro index 66145f60b46..57fc6702a95 100644 --- a/src/plugins/plugins.pro +++ b/src/plugins/plugins.pro @@ -42,12 +42,16 @@ contains(QT_CONFIG, declarative) { !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 { + include(private_headers.pri) + exists($${QT_PRIVATE_HEADERS}/QtDeclarative/private/qdeclarativecontext_p.h) { + !isEmpty(SUPPORT_QT_QML) { + SUBDIRS += plugin_qmlinspector + } + SUBDIRS += plugin_qmldesigner + } else { + !isEmpty(SUPPORT_QT_QML) { warning() warning("QmlDesigner and QmlInspector plugins have been disabled") warning("The plugins depend on on private headers from QtDeclarative module.") diff --git a/src/plugins/qmljseditor/qmljseditorfactory.cpp b/src/plugins/qmljseditor/qmljseditorfactory.cpp index 61d30e9247e..6e684c8f9b1 100644 --- a/src/plugins/qmljseditor/qmljseditorfactory.cpp +++ b/src/plugins/qmljseditor/qmljseditorfactory.cpp @@ -136,6 +136,7 @@ QStringList QmlJSEditorFactory::mimeTypes() const void QmlJSEditorFactory::updateEditorInfoBar(Core::IEditor *editor) { +#ifdef QTCREATOR_WITH_QML if (qobject_cast<QmlJSEditorEditable *>(editor)) { Core::EditorManager::instance()->showEditorInfoBar(QMLDESIGNER_INFO_BAR, tr("Do you want to enable the experimental Qt Quick Designer?"), @@ -145,6 +146,7 @@ void QmlJSEditorFactory::updateEditorInfoBar(Core::IEditor *editor) } else { Core::EditorManager::instance()->hideEditorInfoBar(QMLDESIGNER_INFO_BAR); } +#endif } void QmlJSEditorFactory::activateQmlDesigner() |