qiurui
/
qtbase
mirror of https://github.com/qt/qtbase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

iconv-related cleanup in codecs.pri 

The configuration system already takes care of setting QT_NO_ICONV.

Also move the platform conditions for using iconv from the pri file
to the .json.

Change-Id: I91b08bcee6799deddabcbb4a91d0a3f9ed7f0f28
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
This commit is contained in:
Lars Knoll 2016-08-12 18:50:36 +02:00
parent 60985aa42b
commit cf166e5839
2 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configure.json
View File

@ -2033,20 +2033,20 @@
"description": "POSIX iconv",
"enable": "input.iconv == 'posix'",
"disable": "input.iconv == 'sun' || input.iconv == 'gnu' || input.iconv == 'no'",
"condition": "!config.win32 && tests.posix-iconv"
"condition": "!config.win32 && !config.qnx && !config.android && !config.darwin && tests.posix-iconv"
},
"sun-libiconv": {
"description": "SUN iconv",
"enable": "input.iconv == 'sun'",
"disable": "input.iconv == 'posix' || input.iconv == 'gnu' || input.iconv == 'no'",
"condition": "!config.win32 && !features.posix-libiconv && tests.sun-iconv",
"condition": "!config.win32 && !config.qnx && !config.android && !config.darwin && !features.posix-libiconv && tests.sun-iconv",
"output": [ "privateFeature", "publicQtConfig" ]
},
"gnu-libiconv": {
"description": "GNU iconv",
"enable": "input.iconv == 'gnu'",
"disable": "input.iconv == 'posix' || input.iconv == 'sun' || input.iconv == 'no'",
"condition": "!config.win32 && !features.posix-libiconv && !features.sun-libiconv && libs.gnu_iconv",
"condition": "!config.win32 && !config.qnx && !config.android && !config.darwin && !features.posix-libiconv && !features.sun-libiconv && libs.gnu_iconv",
"output": [ "privateFeature" ]
},
"freetype": {

21
src/corelib/codecs/codecs.pri
View File

@ -40,20 +40,17 @@ qtConfig(icu) {
codecs/qeuckrcodec.cpp \
codecs/qbig5codec.cpp
unix:!qnx:!darwin:!linux-android-* {
qtConfig(iconv) {
HEADERS += codecs/qiconvcodec_p.h
SOURCES += codecs/qiconvcodec.cpp
qtConfig(gnu-libiconv) {
DEFINES += GNU_LIBICONV
QMAKE_USE_PRIVATE += iconv
} else: qtConfig(sun-libiconv) {
DEFINES += GNU_LIBICONV
}
qtConfig(iconv) {
HEADERS += codecs/qiconvcodec_p.h
SOURCES += codecs/qiconvcodec.cpp
qtConfig(gnu-libiconv) {
DEFINES += GNU_LIBICONV
QMAKE_USE_PRIVATE += iconv
} else: qtConfig(sun-libiconv) {
DEFINES += GNU_LIBICONV
}
} else:!win32-msvc* {
DEFINES += QT_NO_ICONV
}
win32 {
SOURCES += codecs/qwindowscodec.cpp
HEADERS += codecs/qwindowscodec_p.h