1 files changed, 2 insertions, 5 deletions
diff --git a/src/corelib/codecs/qtextcodec.h b/src/corelib/codecs/qtextcodec.h
index 97eba2009a..c4f1a09726 100644
--- a/src/corelib/codecs/qtextcodec.h
+++ b/src/corelib/codecs/qtextcodec.h
@@ -117,11 +117,8 @@ public:
     QByteArray fromUnicode(const QChar *in, int length, ConverterState *state = 0) const
         { return convertFromUnicode(in, length, state); }
 
-    // ### Qt 5: merge these functions.
-    QTextDecoder* makeDecoder() const;
-    QTextDecoder* makeDecoder(ConversionFlags flags) const;
-    QTextEncoder* makeEncoder() const;
-    QTextEncoder* makeEncoder(ConversionFlags flags) const;
+    QTextDecoder* makeDecoder(ConversionFlags flags = DefaultConversion) const;
+    QTextEncoder* makeEncoder(ConversionFlags flags = DefaultConversion) const;
 
     virtual QByteArray name() const = 0;
     virtual QList<QByteArray> aliases() const;