projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make UTF-8 the default encoding for QString and tr()
[quassel.git]
/
src
/
common
/
main.cpp
diff --git
a/src/common/main.cpp
b/src/common/main.cpp
index
48b45c2
..
9d87c4b
100644
(file)
--- a/
src/common/main.cpp
+++ b/
src/common/main.cpp
@@
-20,6
+20,8
@@
#include <cstdlib>
#include <cstdlib>
+#include <QTextCodec>
+
#ifdef BUILD_CORE
# include "coreapplication.h"
#elif defined BUILD_QTUI
#ifdef BUILD_CORE
# include "coreapplication.h"
#elif defined BUILD_QTUI
@@
-55,6
+57,12
@@
Q_IMPORT_PLUGIN(qgif)
int main(int argc, char **argv)
{
int main(int argc, char **argv)
{
+#if QT_VERSION < 0x050000
+ // All our source files are in UTF-8, and Qt5 even requires that
+ QTextCodec::setCodecForCStrings(QTextCodec::codecForName("UTF-8"));
+ QTextCodec::setCodecForTr(QTextCodec::codecForName("UTF-8"));
+#endif
+
Quassel::setupBuildInfo();
QCoreApplication::setApplicationName(Quassel::buildInfo().applicationName);
QCoreApplication::setApplicationVersion(Quassel::buildInfo().plainVersionString);
Quassel::setupBuildInfo();
QCoreApplication::setApplicationName(Quassel::buildInfo().applicationName);
QCoreApplication::setApplicationVersion(Quassel::buildInfo().plainVersionString);