diff options
| -rwxr-xr-x | configure | 5 | ||||
| -rw-r--r-- | src/corelib/codecs/qtextcodec.cpp | 8 |
2 files changed, 9 insertions, 4 deletions
@@ -8382,6 +8382,11 @@ if [ "$PLATFORM_QWS" != "yes" -a "$PLATFORM_QPA" != "yes" ]; then [ "$CFG_GRAPHICS_SYSTEM" = "runtime" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_GRAPHICSSYSTEM_RUNTIME" fi +# On Windows codec plugins are used (hardcoded in .pro files) +if [ "$XPLATFORM_MINGW" = "yes" ]; then + QCONFIG_FLAGS="$QCONFIG_FLAGS QT_CODEC_PLUGINS" +fi + # X11/Unix/Mac only configs [ "$CFG_ICONV" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_ICONV" [ "$CFG_GLIB" != "yes" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_GLIB" diff --git a/src/corelib/codecs/qtextcodec.cpp b/src/corelib/codecs/qtextcodec.cpp index 187fc09..ca5c879 100644 --- a/src/corelib/codecs/qtextcodec.cpp +++ b/src/corelib/codecs/qtextcodec.cpp @@ -66,7 +66,7 @@ # include "qtsciicodec_p.h" # include "qisciicodec_p.h" #if !defined(Q_OS_SYMBIAN) && !defined(Q_OS_INTEGRITY) -# if defined(QT_NO_ICONV) && !defined(QT_BOOTSTRAPPED) +# if defined(QT_NO_ICONV) && !defined(QT_BOOTSTRAPPED) && !defined(QT_CODEC_PLUGINS) // no iconv(3) support, must build all codecs into the library # include "../../plugins/codecs/cn/qgb18030codec.h" # include "../../plugins/codecs/jp/qeucjpcodec.h" @@ -74,7 +74,7 @@ # include "../../plugins/codecs/jp/qsjiscodec.h" # include "../../plugins/codecs/kr/qeuckrcodec.h" # include "../../plugins/codecs/tw/qbig5codec.h" -# endif // QT_NO_ICONV +# endif // QT_NO_ICONV && !QT_BOOTSTRAPPED && !QT_CODEC_PLUGINS # if defined(Q_WS_X11) && !defined(QT_BOOTSTRAPPED) # include "qfontlaocodec_p.h" # include "../../plugins/codecs/jp/qfontjpcodec.h" @@ -766,7 +766,7 @@ static void setup() #if !defined(Q_OS_SYMBIAN) && !defined(Q_OS_INTEGRITY) -# if defined(QT_NO_ICONV) && !defined(QT_BOOTSTRAPPED) +# if defined(QT_NO_ICONV) && !defined(QT_BOOTSTRAPPED) && !defined(QT_CODEC_PLUGINS) // no asian codecs when bootstrapping, sorry (void)new QGb18030Codec; (void)new QGbkCodec; @@ -778,7 +778,7 @@ static void setup() (void)new QCP949Codec; (void)new QBig5Codec; (void)new QBig5hkscsCodec; -# endif // QT_NO_ICONV && !QT_BOOTSTRAPPED +# endif // QT_NO_ICONV && !QT_BOOTSTRAPPED && !QT_CODEC_PLUGINS #endif //Q_OS_SYMBIAN #endif // QT_NO_CODECS |