From b0b36cc53c6115e5ca30986ceaf01215d09fcb39 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. Change-Id: I60677ab8506b7cf47f504b880bb1078036984e85 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 876c6f3589..39375a5714 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 a6f8914516..a8a78cec06 100644 --- a/src/corelib/codecs/codecs.pri +++ b/src/corelib/codecs/codecs.pri @@ -38,7 +38,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 v1.2.3