summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorRafael Roquetto <rafael.roquetto@kdab.com>2012-02-02 13:53:37 (GMT)
committerQt by Nokia <qt-info@nokia.com>2012-02-03 19:11:12 (GMT)
commit4672db851932db81ce5fbfca924399697b4d511e (patch)
treed140d6b4e22a5cf6124098095d7dfc3d59fbfe75 /configure
parentbd5a2c94f2460b7a5802415eb701f971e5e88e76 (diff)
downloadQt-4672db851932db81ce5fbfca924399697b4d511e.zip
Qt-4672db851932db81ce5fbfca924399697b4d511e.tar.gz
Qt-4672db851932db81ce5fbfca924399697b4d511e.tar.bz2
Add support for QNX iconv implementation.
QNX implements the POSIX version of iconv (with non-const function signatures). However, it is still necessary to link with libiconv, unlike most cases. Also, its iconv_open does not know how to handle an empty string. cherry-picked from qt5/qtbase 38cba9a37fc5fe76b1549463422ab539a1b4cf24 Change-Id: Ia77633f1ddfdc8f5a8414125f8363749a6449cc8 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure4
1 files changed, 2 insertions, 2 deletions
diff --git a/configure b/configure
index 84b6202..6403a2f 100755
--- a/configure
+++ b/configure
@@ -5600,8 +5600,8 @@ fi
# auto-detect iconv(3) support
if [ "$CFG_ICONV" != "no" ]; then
- if [ "$PLATFORM_QWS" = "yes" -o "$PLATFORM_QPA" = "yes" ]; then
- CFG_ICONV=no
+ if [ "$PLATFORM_QWS" = "yes" ] || [ "$PLATFORM_QPA" = "yes" -a "$CFG_ICONV" = "auto" ]; then
+ CFG_ICONV=no
elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" "$OPT_VERBOSE" "$relpath" "$outpath" "config.tests/unix/iconv" "POSIX iconv" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
CFG_ICONV=yes
elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" "$OPT_VERBOSE" "$relpath" "$outpath" "config.tests/unix/sun-libiconv" "SUN libiconv" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then