From d764bcac39a49b022e59c438c39b9ec471078243 Mon Sep 17 00:00:00 2001
From: Lasse Holmstedt <lasse.holmstedt@nokia.com>
Date: Wed, 14 Jul 2010 16:21:19 +0200
Subject: [PATCH] Fixing merge: enabled QML Designer again

---
 src/plugins/plugins.pro | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro
index 299760f7527..f66ea479776 100644
--- a/src/plugins/plugins.pro
+++ b/src/plugins/plugins.pro
@@ -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")