diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2016-11-22 10:13:41 +0100 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2016-11-23 10:30:57 +0000 |
| commit | fd9e5d90333c385ad191a289b2e95e918c58b242 (patch) | |
| tree | 85dc6eef992799a1bbc5b9d36a9fd2866d6a6b4a /src/corelib/global/qconfig-bootstrapped.h | |
| parent | 7e9aca683abf1360e3d20dfebdd937b2594c94b2 (diff) | |
Clean up iconv configuration
Turn iconv off if ICU is being used (in line with codecs.pri)
and get rid of the DEFINES += GNU_LIBICONV in the pri file.
Change-Id: I6fbca975498adbb3e67f913ae9b1dd5cc53ee8da
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'src/corelib/global/qconfig-bootstrapped.h')
| -rw-r--r-- | src/corelib/global/qconfig-bootstrapped.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/corelib/global/qconfig-bootstrapped.h b/src/corelib/global/qconfig-bootstrapped.h index 3b86e94cdd..4629a57485 100644 --- a/src/corelib/global/qconfig-bootstrapped.h +++ b/src/corelib/global/qconfig-bootstrapped.h @@ -68,6 +68,7 @@ #define QT_CRYPTOGRAPHICHASH_ONLY_SHA1 #define QT_NO_DATASTREAM +#define QT_FEATURE_iconv -1 #define QT_NO_LIBRARY #define QT_FEATURE_library -1 #define QT_NO_QOBJECT |