AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

define QT_NO_ICONV if QT_NO_TEXTCODEC

Browse Source 
This also updates qfeatures.h with various other things that have
been neglected. Run $QTSRCDIR/util/scripts/make_qfeatures_dot_h
after changing qfeatures.txt

Task-number: QTBUG-24816

Change-Id: I18b71fcec71efa9cfe3425fb1a7833456ec411b9
Reviewed-by: Tasuku Suzuki <tasuku.suzuki@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
This commit is contained in:
Jeremy Katz 2012-06-18 22:08:00 +02:00 committed by Qt by Nokia
parent 6eed1ff9d5
commit 23e3c703a1
3 changed files with 29 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/corelib/codecs/qiconvcodec.cpp
View File

@ -39,6 +39,8 @@
**
****************************************************************************/
#ifndef QT_NO_ICONV
#include "qiconvcodec_p.h"
#include "qtextcodec_p.h"
#include <qlibrary.h>
@ -553,3 +555,5 @@ iconv_t QIconvCodec::createIconv_t(const char *to, const char *from)
}
QT_END_NAMESPACE
#endif /* #ifndef QT_NO_ICONV */

28
src/corelib/global/qfeatures.h
View File

@ -115,6 +115,9 @@
// QImage::createHeuristicMask()
//#define QT_NO_IMAGE_HEURISTIC_MASK
// Image Text
//#define QT_NO_IMAGE_TEXT
// QLCDNumber
//#define QT_NO_LCDNUMBER
@ -284,11 +287,21 @@
#define QT_NO_FILESYSTEMMODEL
#endif
// File Transfer Protocol
#if !defined(QT_NO_FTP) && (defined(QT_NO_TEXTDATE))
#define QT_NO_FTP
#endif
// Hyper Text Transfer Protocol
#if !defined(QT_NO_HTTP) && (defined(QT_NO_HOSTINFO))
#define QT_NO_HTTP
#endif
// iconv
#if !defined(QT_NO_ICONV) && (defined(QT_NO_TEXTCODEC))
#define QT_NO_ICONV
#endif
// QLibrary
#if !defined(QT_NO_LIBRARY) && (defined(QT_NO_SETTINGS))
#define QT_NO_LIBRARY
@ -369,11 +382,6 @@
#define QT_NO_XMLSTREAMWRITER
#endif
// Bearer Management
#if !defined(QT_NO_BEARERMANAGEMENT) && (defined(QT_NO_LIBRARY) || defined(QT_NO_PROPERTIES))
#define QT_NO_BEARERMANAGEMENT
#endif
// Context menu
#if !defined(QT_NO_CONTEXTMENU) && (defined(QT_NO_MENU))
#define QT_NO_CONTEXTMENU
@ -384,11 +392,6 @@
#define QT_NO_DBUS
#endif
// File Transfer Protocol
#if !defined(QT_NO_FTP) && (defined(QT_NO_TEXTDATE))
#define QT_NO_FTP
#endif
// QInputContext
#if !defined(QT_NO_IM) && (defined(QT_NO_LIBRARY))
#define QT_NO_IM
@ -474,6 +477,11 @@
#define QT_NO_STYLE_STYLESHEET
#endif
// Bearer Management
#if !defined(QT_NO_BEARERMANAGEMENT) && (defined(QT_NO_LIBRARY) || defined(QT_NO_NETWORKINTERFACE) || defined(QT_NO_PROPERTIES))
#define QT_NO_BEARERMANAGEMENT
#endif
// QColorDialog
#if !defined(QT_NO_COLORDIALOG) && (defined(QT_NO_SPINBOX))
#define QT_NO_COLORDIALOG

7
src/corelib/global/qfeatures.txt
View File

@ -960,6 +960,13 @@ Requires: TEXTCODEC
Name: Big Codecs
SeeAlso: ???
Feature: ICONV
Description: Supports conversions between text encodings using iconv.
Section: Internationalization
Requires: TEXTCODEC
Name: iconv
SeeAlso: ???
# Networking
Feature: HOSTINFO