From 8f15cd191b2d2f9e3c7d5791feba0a11cf5a7ba6 Mon Sep 17 00:00:00 2001 From: Rafael Roquetto Date: Mon, 26 Mar 2012 18:29:16 +0200 Subject: 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 Change-Id: Iee5758d3b31e3827e69a1598a5794b3d5ba25b03 Reviewed-by: Oswald Buddenhagen --- config.tests/unix/iconv/iconv.pro | 2 +- src/corelib/codecs/codecs.pri | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config.tests/unix/iconv/iconv.pro b/config.tests/unix/iconv/iconv.pro index 876c6f3..39375a5 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 app_bundle -mac|win32-g++*|qnx-*-qcc:LIBS += -liconv +mac|win32-g++*|qnx:LIBS += -liconv 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 -- cgit v0.12