feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Revert "Android: Disable QML Debugging"

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

Conflicts:
	src/plugins/android/androiddebugsupport.cpp

Change-Id: I669d587535545846b5fcbdadd0d066f1758a3644
This commit is contained in:
Eike Ziller
2013-05-27 17:19:21 +02:00
parent 45f8e241ba
commit 5b648d8b6e
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/android/androiddebugsupport.cpp
View File

@@ -112,8 +112,7 @@ RunControl *AndroidDebugSupport::createDebugRunControl(AndroidRunConfiguration *
QtSupport::BaseQtVersion *version = QtSupport::QtKitInformation::qtVersion(kit); QtSupport::BaseQtVersion *version = QtSupport::QtKitInformation::qtVersion(kit);
params.solibSearchPath.append(qtSoPaths(version)); params.solibSearchPath.append(qtSoPaths(version));
} }
// FIX ME: Enable Qml Debugging in 2.8 if (aspect->useQmlDebugger()) {
if (aspect->useQmlDebugger() && false) {
params.languages |= QmlLanguage; params.languages |= QmlLanguage;
QTcpServer server; QTcpServer server;
QTC_ASSERT(server.listen(QHostAddress::LocalHost) QTC_ASSERT(server.listen(QHostAddress::LocalHost)