diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2013-10-02 16:09:23 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2013-10-07 15:32:10 +0200 |
| commit | c05e9d52b2721d442c62e1ce4ed1058a756bf396 (patch) | |
| tree | fe7075c906d2d8b6a455c5b2041b874a4d1af58b /src/tools/iostool | |
| parent | 810274d038dc1daf22db42de1b5318d5157ffb85 (diff) | |
| download | qt-creator-c05e9d52b2721d442c62e1ce4ed1058a756bf396.tar.gz | |
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>
Diffstat (limited to 'src/tools/iostool')
| -rw-r--r-- | src/tools/iostool/iostool.pro | 5 | ||||
| -rw-r--r-- | src/tools/iostool/iostool.qbs | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/tools/iostool/iostool.pro b/src/tools/iostool/iostool.pro index fe3392c667..2870efaee2 100644 --- a/src/tools/iostool/iostool.pro +++ b/src/tools/iostool/iostool.pro @@ -1,4 +1,4 @@ -TARGET = iosTool +TARGET = iostool QT += core QT += gui xml @@ -17,7 +17,8 @@ TEMPLATE = app include(../../../qtcreator.pri) -DESTDIR = $$IDE_BIN_PATH +# put into a subdir, so we can deploy a separate qt.conf for it +DESTDIR = $$IDE_LIBEXEC_PATH/ios include(../../rpath.pri) SOURCES += main.cpp \ diff --git a/src/tools/iostool/iostool.qbs b/src/tools/iostool/iostool.qbs index 66c738d5b4..d0ed9ff9d5 100644 --- a/src/tools/iostool/iostool.qbs +++ b/src/tools/iostool/iostool.qbs @@ -18,4 +18,6 @@ QtcTool { cpp.frameworks: base.concat(["CoreFoundation", "CoreServices", "IOKit", "Security", "SystemConfiguration"]) cpp.libraries: base.concat(["ssl", "bz2"]) + + toolInstallDir: project.ide_libexec_path + "/ios" } |