diff options
| author | hjk <[email protected]> | 2025-06-25 10:43:04 +0200 |
|---|---|---|
| committer | hjk <[email protected]> | 2025-07-02 06:15:37 +0000 |
| commit | c5f39d0348acb2170533ccd3816b1f7a3af1c58a (patch) | |
| tree | 3632a19a06107424feccda6053520c4fd6e32af3 | |
| parent | 03173142594b7f13ddf05994b0b443a20588dea0 (diff) | |
... in TextEncoding::fullDisplayName().
There is no replacement for QTextCodec::aliases() in the QStringConverter
world. This may change as result of QTBUG-138036, but for now there's
nothing we can reasonably do.
Change-Id: I1d9431d2d796b84bcef55ee06d2d248b118db8d2
Reviewed-by: David Schulz <[email protected]>
| -rw-r--r-- | src/libs/utils/textcodec.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/libs/utils/textcodec.cpp b/src/libs/utils/textcodec.cpp index ad1fa033d7a..e364598eb7d 100644 --- a/src/libs/utils/textcodec.cpp +++ b/src/libs/utils/textcodec.cpp @@ -6,7 +6,6 @@ #include "qtcassert.h" #include <QHash> -#include <QTextCodec> #include <set> @@ -83,6 +82,10 @@ QString TextEncoding::displayName() const QString TextEncoding::fullDisplayName() const { QString compoundName = displayName(); + +#if 0 + // FIXME: There is no replacement for QTextCodec::aliases() in the + // QStringConverter world (yet?). QTextCodec *codec = m_name == QStringEncoder::nameForEncoding(QStringConverter::System) ? QTextCodec::codecForLocale() : QTextCodec::codecForName(m_name); @@ -93,6 +96,7 @@ QString TextEncoding::fullDisplayName() const compoundName += QString::fromLatin1(alias); } } +#endif return compoundName; } |