feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

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

Browse Source 
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:
Eike Ziller
2013-10-02 16:09:23 +02:00
parent 810274d038
commit c05e9d52b2
12 changed files with 39 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/ios/iostoolhandler.cpp
View File

@@ -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;
}