Commit d764bcac authored by Lasse Holmstedt's avatar Lasse Holmstedt
Browse files

Fixing merge: enabled QML Designer again

parent 6df48b66
......@@ -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")
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment