summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>2015-02-11 10:01:56 +0100
committerEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>2015-02-11 11:05:53 +0000
commit8d27ec664a2dbdd3a4941965dbf3883e671b7bcc (patch)
tree97355942576d686a9042340a030e699d04b228f4
parent59fc0fe8f2f5843d961ea5ae8967eb15850e9231 (diff)
downloadqt-creator-8d27ec664a2dbdd3a4941965dbf3883e671b7bcc.tar.gz
Android: Fix debugging applications that link many modules
When debugging an application we will add a few arguments to the command line for launching the application. We would do the same for every library etc. required by the modules linked to the application. At some point, the command line would become too long and fail to execute. Passing the libraries, libs_prefix, etc. on the command line is not necessary, since the parameters are already included in the AndroidManifest.xml, otherwise it would not be possible to launch the application from the device itself. Change-Id: I93a7f64a4ce32ebb2b25c54b0d17ae2b23706e24 Task-number: QTCREATORBUG-13691 Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
-rw-r--r--src/plugins/android/androidrunner.cpp8
1 files changed, 0 insertions, 8 deletions
diff --git a/src/plugins/android/androidrunner.cpp b/src/plugins/android/androidrunner.cpp
index 5e017f20f9..d833578a79 100644
--- a/src/plugins/android/androidrunner.cpp
+++ b/src/plugins/android/androidrunner.cpp
@@ -390,14 +390,6 @@ void AndroidRunner::asyncStart()
args << _("-e") << _("qml_debug") << _("true");
args << _("-e") << _("qmljsdebugger") << QString::fromLatin1("port:%1,block").arg(m_qmlPort);
}
- if (m_useLocalQtLibs) {
- args << _("-e") << _("use_local_qt_libs") << _("true");
- args << _("-e") << _("libs_prefix") << _("/data/local/tmp/qt/");
- args << _("-e") << _("load_local_libs") << m_localLibs;
- args << _("-e") << _("load_local_jars") << m_localJars;
- if (!m_localJarsInitClasses.isEmpty())
- args << _("-e") << _("static_init_classes") << m_localJarsInitClasses;
- }
QProcess adb;
adb.start(m_adb, args);