diff options
-rw-r--r-- | config.tests/unix/iconv/iconv.pro | 2 | ||||
-rw-r--r-- | 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 |