diff options
| author | Rafael Roquetto <rafael.roquetto.qnx@kdab.com> | 2012-03-26 16:29:16 (GMT) |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-28 09:52:54 (GMT) |
| commit | 8f15cd191b2d2f9e3c7d5791feba0a11cf5a7ba6 (patch) | |
| tree | 82154b040af0206c54b4faa35860e486d337793b /src/corelib | |
| parent | f33ad9d6548d4544ad2ea6229b47093efa9ea0ef (diff) | |
| download | Qt-8f15cd191b2d2f9e3c7d5791feba0a11cf5a7ba6.zip Qt-8f15cd191b2d2f9e3c7d5791feba0a11cf5a7ba6.tar.gz Qt-8f15cd191b2d2f9e3c7d5791feba0a11cf5a7ba6.tar.bz2 | |
Fix scopes on iconv related pro/pri files
Ensure corelib and the iconv configure test link against libiconv on QNX-based
platforms. This now includes the Blackberry mkspecs which were
previously excluded.
cherry-picked from qt5/qtbase: b0b36cc53c6115e5ca30986ceaf01215d09fcb39
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Change-Id: Iee5758d3b31e3827e69a1598a5794b3d5ba25b03
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/codecs/codecs.pri | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/codecs/codecs.pri b/src/corelib/codecs/codecs.pri index 8e46050..9090773 100644 --- a/src/corelib/codecs/codecs.pri +++ b/src/corelib/codecs/codecs.pri @@ -25,7 +25,7 @@ unix { contains(QT_CONFIG,iconv) { HEADERS += codecs/qiconvcodec_p.h SOURCES += codecs/qiconvcodec.cpp - qnx-*-qcc:LIBS_PRIVATE *= -liconv + qnx:LIBS_PRIVATE *= -liconv } else:contains(QT_CONFIG,gnu-libiconv) { HEADERS += codecs/qiconvcodec_p.h SOURCES += codecs/qiconvcodec.cpp |