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

Merge remote-tracking branch 'origin/2.7' into 2.8

Browse Source 
Conflicts:
	src/plugins/android/androiddebugsupport.cpp
	src/plugins/qtsupport/qtsupport.qbs

Change-Id: I0953ca21a9db05084a79b8a6019189ea982df0b1
This commit is contained in:
Eike Ziller
2013-05-27 17:17:40 +02:00
parent 116db445bf 4ae9f3778f
commit 45f8e241ba
22 changed files with 27 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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