From 5b648d8b6eb0fe9f2690a587116d71c71c9b4d96 Mon Sep 17 00:00:00 2001
From: Eike Ziller <eike.ziller@digia.com>
Date: Mon, 27 May 2013 17:19:21 +0200
Subject: [PATCH] Revert "Android: Disable QML Debugging"

Was temporarily disabled for 2.7 and not supposed to be merged into 2.8
This reverts commit d3e69915da08261bce6d80713a24c9afe9a39586.

Conflicts:
	src/plugins/android/androiddebugsupport.cpp

Change-Id: I669d587535545846b5fcbdadd0d066f1758a3644
---
 src/plugins/android/androiddebugsupport.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/plugins/android/androiddebugsupport.cpp b/src/plugins/android/androiddebugsupport.cpp
index 93c635d93ae..6b480f6fd19 100644
--- a/src/plugins/android/androiddebugsupport.cpp
+++ b/src/plugins/android/androiddebugsupport.cpp
@@ -112,8 +112,7 @@ RunControl *AndroidDebugSupport::createDebugRunControl(AndroidRunConfiguration *
         QtSupport::BaseQtVersion *version = QtSupport::QtKitInformation::qtVersion(kit);
         params.solibSearchPath.append(qtSoPaths(version));
     }
-    // FIX ME: Enable Qml Debugging in 2.8
-    if (aspect->useQmlDebugger() && false) {
+    if (aspect->useQmlDebugger()) {
         params.languages |= QmlLanguage;
         QTcpServer server;
         QTC_ASSERT(server.listen(QHostAddress::LocalHost)