summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorPeter Kümmel <syntheticpp@gmx.net>2012-10-18 15:20:41 (GMT)
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-11-03 17:37:34 (GMT)
commit8f530118d75b288d8d825ff19640e376e8f98cdf (patch)
treeb8e1e42a30f2095261d9a03367e2add711853d05 /configure
parent7080cc765c9566e852797dbaf60fe50a2fcc2b72 (diff)
downloadQt-8f530118d75b288d8d825ff19640e376e8f98cdf.zip
Qt-8f530118d75b288d8d825ff19640e376e8f98cdf.tar.gz
Qt-8f530118d75b288d8d825ff19640e376e8f98cdf.tar.bz2
x-compile with mingw: fix codec linker errors
Don't build codecs into Core when plugins are used. Qt5 doesn't use plugins for the codecs any more and they are part of Core. This change was considered too drastic for Qt 4.8, so no backport is possible. Task-number: QTBUG-27618 Change-Id: I01347645cedc6f4ecaf3158ea8336b0672ac9a46 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure5
1 files changed, 5 insertions, 0 deletions
diff --git a/configure b/configure
index 25a27de..08d9270 100755
--- a/configure
+++ b/configure
@@ -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"