packages (DEVEL): qt4/qt4-locale.patch - up to 4.6.0 beta1
cactus
cactus at pld-linux.org
Sun Oct 18 02:00:46 CEST 2009
Author: cactus Date: Sun Oct 18 00:00:46 2009 GMT
Module: packages Tag: DEVEL
---- Log message:
- up to 4.6.0 beta1
---- Files affected:
packages/qt4:
qt4-locale.patch (1.10.2.2 -> 1.10.2.3)
---- Diffs:
================================================================
Index: packages/qt4/qt4-locale.patch
diff -u packages/qt4/qt4-locale.patch:1.10.2.2 packages/qt4/qt4-locale.patch:1.10.2.3
--- packages/qt4/qt4-locale.patch:1.10.2.2 Sun Apr 6 10:42:54 2008
+++ packages/qt4/qt4-locale.patch Sun Oct 18 02:00:41 2009
@@ -143,17 +143,15 @@
diff -Nur qt-x11-opensource-src-4.2.1.orig/tools/linguist/linguist/main.cpp qt-x11-opensource-src-4.2.1.chng/tools/linguist/linguist/main.cpp
--- qt-x11-opensource-src-4.2.1.orig/tools/linguist/linguist/main.cpp 2006-10-20 17:35:26.000000000 +0200
+++ qt-x11-opensource-src-4.2.1.chng/tools/linguist/linguist/main.cpp 2006-11-28 14:21:19.000000000 +0100
-@@ -41,11 +41,11 @@
- }
-
- QTranslator translator(0);
-- translator.load(QLatin1String("linguist_") + QLocale::system().name(), resourceDir);
-+ translator.load(QLatin1String("qt4-linguist_") + QLocale::system().name(), resourceDir);
- app.installTranslator(&translator);
-
- QTranslator qtTranslator(0);
-- qtTranslator.load(QLatin1String("qt_") + QLocale::system().name(), resourceDir);
-+ qtTranslator.load(QLatin1String("qt4_") + QLocale::system().name(), resourceDir);
- app.installTranslator(&qtTranslator);
-
- app.setOrganizationName(QLatin1String("Trolltech"));
+@@ -83,9 +83,9 @@
+ QTranslator translator;
+ QTranslator qtTranslator;
+ QString sysLocale = QLocale::system().name();
+- if (translator.load(QLatin1String("linguist_") + sysLocale, resourceDir)) {
++ if (translator.load(QLatin1String("qt4-linguist_") + sysLocale, resourceDir)) {
+ app.installTranslator(&translator);
+- if (qtTranslator.load(QLatin1String("qt_") + sysLocale, resourceDir))
++ if (qtTranslator.load(QLatin1String("qt4_") + sysLocale, resourceDir))
+ app.installTranslator(&qtTranslator);
+ else
+ app.removeTranslator(&translator);
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/qt4/qt4-locale.patch?r1=1.10.2.2&r2=1.10.2.3&f=u
More information about the pld-cvs-commit
mailing list