diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2016-08-22 16:30:49 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2016-08-22 16:30:56 +0200 |
| commit | 841778ed69125b1d9e05156bf1a1c1e274c1877c (patch) | |
| tree | 127d54ac8bf5d3bbca1297ab8fee628cf0b92512 /src/tools | |
| parent | f41b48ef5dea5c594d555c2e553c1c2e603d7838 (diff) | |
| parent | e87da5a08a686084840cace2901ec1ff5e87a0ab (diff) | |
| download | qt-creator-841778ed69125b1d9e05156bf1a1c1e274c1877c.tar.gz | |
Merge remote-tracking branch 'origin/4.1'
Change-Id: I80f96f100046625f24b6ab5d13fdb05660365abc
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/iostool/iostool.pro | 2 | ||||
| -rw-r--r-- | src/tools/iostool/iostool.qbs | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/tools/iostool/iostool.pro b/src/tools/iostool/iostool.pro index 6a8bcab6a1..8ea9a78d6b 100644 --- a/src/tools/iostool/iostool.pro +++ b/src/tools/iostool/iostool.pro @@ -11,7 +11,7 @@ CONFIG += console QMAKE_LFLAGS += -Wl,-sectcreate,__TEXT,__info_plist,\"$$PWD/Info.plist\" CONFIG -= app_bundle -LIBS += -framework CoreFoundation -framework CoreServices -framework IOKit -lssl -lbz2 -framework Security -framework SystemConfiguration +LIBS += -framework CoreFoundation -framework CoreServices -framework IOKit -framework Security -framework SystemConfiguration TEMPLATE = app diff --git a/src/tools/iostool/iostool.qbs b/src/tools/iostool/iostool.qbs index b06d996e00..abc8a5bac1 100644 --- a/src/tools/iostool/iostool.qbs +++ b/src/tools/iostool/iostool.qbs @@ -17,7 +17,6 @@ QtcTool { ] cpp.frameworks: base.concat(["CoreFoundation", "CoreServices", "IOKit", "Security", "SystemConfiguration"]) - cpp.dynamicLibraries: base.concat(["ssl", "bz2"]) bundle.infoPlistFile: "Info.plist" installDir: qtc.ide_libexec_path + "/ios" |