From 7bc1af275d66f4615296463cdbaaaa9234baca58 Mon Sep 17 00:00:00 2001 From: Daniel Teske Date: Thu, 23 Apr 2015 19:05:56 +0200 Subject: [PATCH] Debugger/Android: Add the Qt's qml directory as a search path Change-Id: I5244eda989220aa2e2f8a225294d3c1dd0d97a2a Task-number: QTCREATORBUG-13245 Reviewed-by: hjk Reviewed-by: Daniel Teske --- src/plugins/android/androiddebugsupport.cpp | 6 ++++++ src/plugins/debugger/debuggerengine.cpp | 1 + src/plugins/debugger/debuggerplugin.cpp | 2 ++ src/plugins/debugger/debuggerstartparameters.h | 1 + 4 files changed, 10 insertions(+) diff --git a/src/plugins/android/androiddebugsupport.cpp b/src/plugins/android/androiddebugsupport.cpp index 5fee5df7080..0b7f2122729 100644 --- a/src/plugins/android/androiddebugsupport.cpp +++ b/src/plugins/android/androiddebugsupport.cpp @@ -116,6 +116,12 @@ RunControl *AndroidDebugSupport::createDebugRunControl(AndroidRunConfiguration * params.remoteSetupNeeded = true; //TODO: Not sure if these are the right paths. params.projectSourceDirectory = target->project()->projectDirectory().toString(); + Kit *kit = target->kit(); + QtSupport::BaseQtVersion *version = QtSupport::QtKitInformation::qtVersion(kit); + if (version) { + const QString qmlQtDir = version->versionInfo().value(QLatin1String("QT_INSTALL_QML")); + params.additionalSearchDirectories = QStringList(qmlQtDir); + } params.projectSourceFiles = target->project()->files(Project::ExcludeGeneratedFiles); params.projectBuildDirectory = target->activeBuildConfiguration()->buildDirectory().toString(); } diff --git a/src/plugins/debugger/debuggerengine.cpp b/src/plugins/debugger/debuggerengine.cpp index f22dc5a3c25..c9234c8fa08 100644 --- a/src/plugins/debugger/debuggerengine.cpp +++ b/src/plugins/debugger/debuggerengine.cpp @@ -1310,6 +1310,7 @@ QString DebuggerEngine::toFileInProject(const QUrl &fileUrl) const DebuggerStartParameters &sp = startParameters(); d->m_fileFinder.setProjectDirectory(sp.projectSourceDirectory); d->m_fileFinder.setProjectFiles(sp.projectSourceFiles); + d->m_fileFinder.setAdditionalSearchDirectories(sp.additionalSearchDirectories); d->m_fileFinder.setSysroot(sp.sysRoot); return d->m_fileFinder.findFile(fileUrl); diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp index ab39164e620..b1c01f2b3d2 100644 --- a/src/plugins/debugger/debuggerplugin.cpp +++ b/src/plugins/debugger/debuggerplugin.cpp @@ -2307,6 +2307,8 @@ static QString formatStartParameters(DebuggerStartParameters &sp) str << " (built: " << QDir::toNativeSeparators(sp.projectBuildDirectory) << ')'; str << '\n'; + str << "Addtional Search Directories:" + << sp.additionalSearchDirectories.join(QLatin1Char(' ')) << '\n'; } if (!sp.qmlServerAddress.isEmpty()) str << "QML server: " << sp.qmlServerAddress << ':' diff --git a/src/plugins/debugger/debuggerstartparameters.h b/src/plugins/debugger/debuggerstartparameters.h index c6e7eb304db..27aff60495c 100644 --- a/src/plugins/debugger/debuggerstartparameters.h +++ b/src/plugins/debugger/debuggerstartparameters.h @@ -127,6 +127,7 @@ public: QString qmlServerAddress; quint16 qmlServerPort; QString projectSourceDirectory; + QStringList additionalSearchDirectories; QString projectBuildDirectory; QStringList projectSourceFiles;