Ios: Move tools to <libexec>/ios, make them lowercase, fix deployment

They can't be directly in libexec path, because then they couldn't have
their own qt.conf for resolving the Cocoa platform plugin.

Change-Id: I8f3fae85c548747a7d826c078c7ac1fb0a836b43
Reviewed-by: Fawzi Mohamed <[email protected]>

1 files changed, 3 insertions, 2 deletions

diff --git a/src/plugins/ios/iostoolhandler.cpp b/src/plugins/ios/iostoolhandler.cpp
index d7fc26d9672..c3643c9e370 100644
--- a/src/plugins/ios/iostoolhandler.cpp
+++ b/src/plugins/ios/iostoolhandler.cpp
@@ -30,6 +30,7 @@
 #include "iostoolhandler.h"
 #include "iosconfigurations.h"
 
+#include <coreplugin/icore.h>
 #include <utils/qtcassert.h>
 #include <utils/fileutils.h>
 
@@ -924,13 +925,13 @@ void IosSimulatorToolHandlerPrivate::addDeviceArguments(QStringList &args) const
 
 QString IosToolHandler::iosDeviceToolPath()
 {
-    QString res = QCoreApplication::applicationDirPath() + QLatin1String("/iosTool");
+    QString res = Core::ICore::libexecPath() + QLatin1String("/ios/iostool");
     return res;
 }
 
 QString IosToolHandler::iosSimulatorToolPath()
 {
-    QString res = QCoreApplication::applicationDirPath() + QLatin1String("/iossim");
+    QString res = Core::ICore::libexecPath() + QLatin1String("/ios/iossim");
     return res;
 }