diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-02-23 11:24:04 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-02-23 11:24:07 +0100 |
| commit | d34353a065c443aac20376cbd88323480d769183 (patch) | |
| tree | da5d86b51c2cf7023356551c4c980849b35bab14 /config.tests/unix/iconv/iconv.pro | |
| parent | 4e40b1952695f0b1086ef7b88e8514bd18cf96bf (diff) | |
| parent | 571908f7fc8f5e4ef9a4dfd90102566f6f0fcad2 (diff) | |
Merge dev into 5.5
Change-Id: Id6dbbbfc542c214fe695c6795c6aaf23aedc1cd1
Diffstat (limited to 'config.tests/unix/iconv/iconv.pro')
| -rw-r--r-- | config.tests/unix/iconv/iconv.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config.tests/unix/iconv/iconv.pro b/config.tests/unix/iconv/iconv.pro index 65a67f16d3..ca12e51947 100644 --- a/config.tests/unix/iconv/iconv.pro +++ b/config.tests/unix/iconv/iconv.pro @@ -1,3 +1,3 @@ SOURCES = iconv.cpp CONFIG -= qt dylib -mac|mingw|qnx:LIBS += -liconv +mac|mingw|qnx|haiku:LIBS += -liconv |