diff options
| author |  Tomaz Canabrava <tomaz.canabrava@gmail.com> | 2015-05-24 13:20:13 -0300 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2015-05-24 09:37:23 -0700 |
| commit | e744fc5bba486a53a10c91f67e006a955a420a92 (patch) | |
| tree | c7431e758ea9788718197a9d78605d4fd66a167c /qt-gui.cpp | |
| parent | dbed94f12c514c885bc0ecb0751bb424c067683c (diff) | |
| download | subsurface-e744fc5bba486a53a10c91f67e006a955a420a92.tar.gz | |
Remove support for Qt4 (part 7)
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'qt-gui.cpp')
| -rw-r--r-- | qt-gui.cpp | 16 |
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"); |