diff options
Diffstat (limited to 'src/corelib/configure.cmake')
-rw-r--r-- | src/corelib/configure.cmake | 51 |
1 files changed, 0 insertions, 51 deletions
diff --git a/src/corelib/configure.cmake b/src/corelib/configure.cmake index 5df72d869e..2637e2abfc 100644 --- a/src/corelib/configure.cmake +++ b/src/corelib/configure.cmake @@ -6,10 +6,6 @@ set(INPUT_doubleconversion "undefined" CACHE STRING "") set_property(CACHE INPUT_doubleconversion PROPERTY STRINGS undefined no qt system) -# input iconv -set(INPUT_iconv "undefined" CACHE STRING "") -set_property(CACHE INPUT_iconv PROPERTY STRINGS undefined no yes posix sun gnu) - #### Libraries @@ -590,31 +586,6 @@ qt_feature("glibc" PRIVATE AUTODETECT LINUX CONDITION TEST_glibc ) -qt_feature("iconv" PUBLIC PRIVATE - SECTION "Internationalization" - LABEL "iconv" - PURPOSE "Provides internationalization on Unix." - CONDITION NOT QT_FEATURE_icu AND QT_FEATURE_textcodec AND ( TEST_posix_iconv OR TEST_sun_iconv ) -) -qt_feature_definition("iconv" "QT_NO_ICONV" NEGATE VALUE "1") -qt_feature("posix-libiconv" PRIVATE - LABEL "POSIX iconv" - CONDITION NOT WIN32 AND NOT QNX AND NOT ANDROID AND NOT APPLE AND TEST_posix_iconv AND TEST_iconv_needlib - ENABLE TEST_posix_iconv AND TEST_iconv_needlib - DISABLE NOT TEST_posix_iconv OR NOT TEST_iconv_needlib -) -qt_feature("sun-libiconv" - LABEL "SUN iconv" - CONDITION NOT WIN32 AND NOT QNX AND NOT ANDROID AND NOT APPLE AND TEST_sun_iconv - ENABLE TEST_sun_iconv - DISABLE NOT TEST_sun_iconv -) -qt_feature("gnu-libiconv" PRIVATE - LABEL "GNU iconv" - CONDITION NOT WIN32 AND NOT QNX AND NOT ANDROID AND NOT APPLE AND TEST_posix_iconv AND NOT TEST_iconv_needlib - ENABLE TEST_posix_iconv AND NOT TEST_iconv_needlib - DISABLE NOT TEST_posix_iconv OR TEST_iconv_needlib -) qt_feature("icu" PRIVATE LABEL "ICU" AUTODETECT NOT WIN32 @@ -650,7 +621,6 @@ qt_feature("mimetype" PUBLIC SECTION "Utilities" LABEL "Mimetype handling" PURPOSE "Provides MIME type handling." - CONDITION QT_FEATURE_textcodec ) qt_feature_definition("mimetype" "QT_NO_MIMETYPE" NEGATE VALUE "1") qt_feature("mimetype-database" PRIVATE @@ -882,26 +852,6 @@ qt_feature("translation" PUBLIC PURPOSE "Supports translations using QObject::tr()." ) qt_feature_definition("translation" "QT_NO_TRANSLATION" NEGATE VALUE "1") -qt_feature("textcodec" PUBLIC - SECTION "Internationalization" - LABEL "QTextCodec" - PURPOSE "Supports conversions between text encodings." -) -qt_feature_definition("textcodec" "QT_NO_TEXTCODEC" NEGATE VALUE "1") -qt_feature("codecs" PUBLIC - SECTION "Internationalization" - LABEL "Codecs" - PURPOSE "Supports non-unicode text conversions." - CONDITION QT_FEATURE_textcodec -) -qt_feature_definition("codecs" "QT_NO_CODECS" NEGATE VALUE "1") -qt_feature("big_codecs" PUBLIC - SECTION "Internationalization" - LABEL "Big Codecs" - PURPOSE "Supports big codecs, e.g. CJK." - CONDITION QT_FEATURE_textcodec -) -qt_feature_definition("big_codecs" "QT_NO_BIG_CODECS" NEGATE VALUE "1") qt_feature("easingcurve" PUBLIC SECTION "Utilities" LABEL "Easing curve" @@ -1004,7 +954,6 @@ qt_configure_add_summary_section(NAME "Qt Core") qt_configure_add_summary_entry(ARGS "doubleconversion") qt_configure_add_summary_entry(ARGS "system-doubleconversion") qt_configure_add_summary_entry(ARGS "glib") -qt_configure_add_summary_entry(ARGS "iconv") qt_configure_add_summary_entry(ARGS "icu") qt_configure_add_summary_entry(ARGS "mimetype-database") qt_configure_add_summary_entry( |