diff options
| author | hjk <hjk@qt.io> | 2019-06-20 17:19:12 +0200 |
|---|---|---|
| committer | hjk <hjk@qt.io> | 2019-06-21 10:32:31 +0000 |
| commit | 1396c6e8e99d69291117b31fe5d31636ff8831ff (patch) | |
| tree | 01e7206aea1b889ae1d0b3e1d79dd6b666ef9018 /src/plugins/android | |
| parent | 18eb0b39c517019c9fec711c055b5d42f20aae10 (diff) | |
| download | qt-creator-1396c6e8e99d69291117b31fe5d31636ff8831ff.tar.gz | |
ProjectExplorer: Use Utils::FileName for Runnable::executable
Change-Id: I584bc18aa19a4c9886af7b13e95052dfd4350b34
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Diffstat (limited to 'src/plugins/android')
| -rw-r--r-- | src/plugins/android/androiddebugsupport.cpp | 3 | ||||
| -rw-r--r-- | src/plugins/android/androidplugin.cpp | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/plugins/android/androiddebugsupport.cpp b/src/plugins/android/androiddebugsupport.cpp index a703c31936..09368133f3 100644 --- a/src/plugins/android/androiddebugsupport.cpp +++ b/src/plugins/android/androiddebugsupport.cpp @@ -176,8 +176,7 @@ void AndroidDebugSupport::start() solibSearchPath.removeDuplicates(); setSolibSearchPath(solibSearchPath); qCDebug(androidDebugSupportLog) << "SoLibSearchPath: "<<solibSearchPath; - setSymbolFile(target->activeBuildConfiguration()->buildDirectory().toString() - + "/app_process"); + setSymbolFile(target->activeBuildConfiguration()->buildDirectory().pathAppended("app_process")); setSkipExecutableValidation(true); setUseExtendedRemote(true); QUrl gdbServer; diff --git a/src/plugins/android/androidplugin.cpp b/src/plugins/android/androidplugin.cpp index 29f4392712..6999162914 100644 --- a/src/plugins/android/androidplugin.cpp +++ b/src/plugins/android/androidplugin.cpp @@ -96,7 +96,7 @@ public: addSupportedRunMode(QML_PREVIEW_RUN_MODE); setProducer([](RunControl *runControl) -> RunWorker * { const Runnable runnable = runControl->runConfiguration()->runnable(); - return new AndroidQmlToolingSupport(runControl, runnable.executable); + return new AndroidQmlToolingSupport(runControl, runnable.executable.toString()); }); addConstraint([](RunConfiguration *runConfig) { return runConfig->isEnabled() |