forked from qt-creator/qt-creator
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 <fawzi.mohamed@digia.com>
This commit is contained in:
@@ -103,14 +103,6 @@ void IosConfigurations::setConfig(const IosConfig &devConfigs)
|
||||
emit updated();
|
||||
}
|
||||
|
||||
FileName IosConfigurations::iosToolPath() const
|
||||
{
|
||||
FileName res = FileName::fromString(QCoreApplication::applicationDirPath()
|
||||
+ QLatin1String("/iosTool"));
|
||||
return res;
|
||||
}
|
||||
|
||||
|
||||
bool equalKits(Kit *a, Kit *b)
|
||||
{
|
||||
return ToolChainKitInformation::toolChain(a) == ToolChainKitInformation::toolChain(b)
|
||||
|
||||
@@ -64,7 +64,6 @@ public:
|
||||
static IosConfigurations &instance();
|
||||
IosConfig config() const { return m_config; }
|
||||
void setConfig(const IosConfig &config);
|
||||
Utils::FileName iosToolPath() const;
|
||||
|
||||
QStringList sdkTargets();
|
||||
void updateSimulators();
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user