Mercurial Repositories > eric / file diff

--- a/Toolbox/Startup.py	Sat Jan 11 12:55:28 2014 +0100
+++ b/Toolbox/Startup.py	Sat Jan 11 13:05:23 2014 +0100
@@ -10,7 +10,8 @@
 import os
 import sys
 
-from PyQt4.QtCore import QTranslator, QLocale, QLibraryInfo, QDir, QTextCodec
+from PyQt4.QtCore import QTranslator, QLocale, QLibraryInfo, QDir, \
+    QTextCodec, qVersion
 from PyQt4.QtGui import QApplication
 
 from E5Gui.E5Application import E5Application
@@ -161,8 +162,9 @@
     
     global loaded_translators
     
-    # set the default encoding for tr()
-    QTextCodec.setCodecForTr(QTextCodec.codecForName("utf-8"))
+    if qVersion() < "5.0.0":
+        # set the default encoding for tr()
+        QTextCodec.setCodecForTr(QTextCodec.codecForName("utf-8"))
     
     translations = ("qt", "eric5") + translationFiles
     loc = Preferences.getUILanguage()