aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--qt-gui.cpp16
1 files changed, 1 insertions, 15 deletions
diff --git a/qt-gui.cpp b/qt-gui.cpp
index 474622e99..445602b11 100644
--- a/qt-gui.cpp
+++ b/qt-gui.cpp
@@ -25,26 +25,12 @@ void init_ui(void)
// note: on Linux, "system" == "environment variables"
QNetworkProxyFactory::setUseSystemConfiguration(true);
-#if QT_VERSION < 0x050000
- // ask QString in Qt 4 to interpret all char* as UTF-8,
- // like Qt 5 does.
- // 106 is "UTF-8", this is faster than lookup by name
- // [http://www.iana.org/assignments/character-sets/character-sets.xml]
- QTextCodec::setCodecForCStrings(QTextCodec::codecForMib(106));
- // and for reasons I can't understand, I need to do the same again for tr
- // even though that clearly uses C strings as well...
- QTextCodec::setCodecForTr(QTextCodec::codecForMib(106));
-#ifdef Q_OS_WIN
- QFile::setDecodingFunction(decodeUtf8);
- QFile::setEncodingFunction(encodeUtf8);
-#endif
-#else
// for Win32 and Qt5 we try to set the locale codec to UTF-8.
// this makes QFile::encodeName() work.
#ifdef Q_OS_WIN
QTextCodec::setCodecForLocale(QTextCodec::codecForMib(106));
#endif
-#endif
+
QCoreApplication::setOrganizationName("Subsurface");
QCoreApplication::setOrganizationDomain("subsurface.hohndel.org");
QCoreApplication::setApplicationName("Subsurface");