Fixing merge: enabled QML Designer again

This commit is contained in:
Lasse Holmstedt
2010-07-14 16:21:19 +02:00
parent 6df48b6650
commit d764bcac39

View File

@@ -42,9 +42,7 @@ contains(QT_CONFIG, declarative) {
include(../private_headers.pri)
exists($${QT_PRIVATE_HEADERS}/QtDeclarative/private/qdeclarativecontext_p.h) {
# ### disabled because it contains same files as qmlviewer, so slower to use locator
# plugin_qmldesigner \
SUBDIRS += plugin_qmljsinspector
SUBDIRS += plugin_qmldesigner plugin_qmljsinspector
} else {
warning()
warning("QmlDesigner and QmlJSInspector plugins have been disabled")