diff options
| author | Karsten Heimrich <karsten.heimrich@qt.io> | 2020-06-17 12:33:40 +0200 |
|---|---|---|
| committer | Karsten Heimrich <karsten.heimrich@qt.io> | 2020-06-20 02:04:38 +0200 |
| commit | 18ec53156ee704fdb4977436fccfdc85333e614b (patch) | |
| tree | df734ce7893d570f4a90f923fcfe9c80ddc3de05 /cmake | |
| parent | 4455de24d453138411c57bae55af18f3fba58d4b (diff) | |
Move QTextCodec support out of QtCore
* Assume UTF-8 on all Unix like systems
* Export some functions to be able to compile QTextCodec once
moved to Qt5Compat.
Task-number: QTBUG-75665
Change-Id: I52ec47a848bc0ba72e9c7689668b1bcc5d736c29
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/QtBaseConfigureTests.cmake | 68 |
1 files changed, 0 insertions, 68 deletions
diff --git a/cmake/QtBaseConfigureTests.cmake b/cmake/QtBaseConfigureTests.cmake index 0844c8df20..ab53ad28b7 100644 --- a/cmake/QtBaseConfigureTests.cmake +++ b/cmake/QtBaseConfigureTests.cmake @@ -86,64 +86,6 @@ function(qt_run_config_test_architecture) endfunction() -function(qt_run_config_test_posix_iconv) - set(source "#include <iconv.h> - -int main(int, char **) -{ - iconv_t x = iconv_open(\"\", \"\"); - - char *inp; - char *outp; - size_t inbytes, outbytes; - iconv(x, &inp, &inbytes, &outp, &outbytes); - - iconv_close(x); - - return 0; -}") - check_cxx_source_compiles("${source}" HAVE_POSIX_ICONV) - - if(NOT HAVE_POSIX_ICONV) - set(_req_libraries "${CMAKE_REQUIRE_LIBRARIES}") - set(CMAKE_REQUIRE_LIBRARIES "iconv") - check_cxx_source_compiles("${source}" HAVE_POSIX_ICONV) - set(CMAKE_REQUIRE_LIBRARIES "${_req_libraries}") - if(HAVE_POSIX_ICONV) - set(TEST_iconv_needlib 1 CACHE INTERNAL "Need to link against libiconv") - endif() - endif() - - set(TEST_posix_iconv "${HAVE_POSIX_ICONV}" CACHE INTERNAL "POSIX iconv") -endfunction() - - -function(qt_run_config_test_sun_iconv) - set(source "#include <iconv.h> - -int main(int, char **) -{ - iconv_t x = iconv_open(\"\", \"\"); - - const char *inp; - char *outp; - size_t inbytes, outbytes; - iconv(x, &inp, &inbytes, &outp, &outbytes); - - iconv_close(x); - - return 0; -}") - if(DARWIN) - # as per !config.darwin in configure.json - set(HAVE_SUN_ICONV OFF) - else() - check_cxx_source_compiles("${source}" HAVE_SUN_ICONV) - endif() - - set(TEST_sun_iconv "${HAVE_SUN_ICONV}" CACHE INTERNAL "SUN libiconv") -endfunction() - function(qt_run_linker_version_script_support) file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/version_flag.map" "VERS_1 { global: sym; }; VERS_2 { global: sym; } @@ -172,16 +114,6 @@ VERS_1; endfunction() function(qt_run_qtbase_config_tests) - qt_run_config_test_posix_iconv() - - add_library(Iconv INTERFACE) - if(TEST_iconv_needlib) - target_link_libraries(Iconv PUBLIC iconv) - endif() - - if(NOT TEST_posix_iconv) - qt_run_config_test_sun_iconv() - endif() qt_run_config_test_architecture() qt_run_linker_version_script_support() endfunction() |