SOURCES: qt4-build-lib-static.patch, qt4-locale.patch - updated

[arekm]

Author: arekm                        Date: Tue Mar  3 14:24:48 2009 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated

---- Files affected:
SOURCES:
   qt4-build-lib-static.patch (1.5 -> 1.6) , qt4-locale.patch (1.12 -> 1.13) 

---- Diffs:

================================================================
Index: SOURCES/qt4-build-lib-static.patch
diff -u SOURCES/qt4-build-lib-static.patch:1.5 SOURCES/qt4-build-lib-static.patch:1.6
--- SOURCES/qt4-build-lib-static.patch:1.5	Tue Jun 17 20:00:43 2008
+++ SOURCES/qt4-build-lib-static.patch	Tue Mar  3 15:24:42 2009
@@ -35,13 +35,4 @@
  include(../lib/uilib/uilib.pri)
  
  HEADERS += quiloader.h
-@@ -32,6 +32,9 @@
- HEADERS += quiloader.h
- SOURCES += quiloader.cpp
- 
-+target.path=$$[QT_INSTALL_LIBS]
-+INSTALLS        += target
-+
- include($$QT_SOURCE_TREE/include/QtUiTools/headers.pri)
- quitools_headers.files = $$SYNCQT.HEADER_FILES $$SYNCQT.HEADER_CLASSES
- quitools_headers.path = $$[QT_INSTALL_HEADERS]/QtUiTools
+

================================================================
Index: SOURCES/qt4-locale.patch
diff -u SOURCES/qt4-locale.patch:1.12 SOURCES/qt4-locale.patch:1.13
--- SOURCES/qt4-locale.patch:1.12	Tue Jun 17 20:01:53 2008
+++ SOURCES/qt4-locale.patch	Tue Mar  3 15:24:43 2009
@@ -143,15 +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 @@
+@@ -80,11 +80,11 @@
      }
  
-     QTranslator translator(0);
+     QTranslator translator;
 -    translator.load(QLatin1String("linguist_") + QLocale::system().name(), resourceDir);
 +    translator.load(QLatin1String("qt4-linguist_") + QLocale::system().name(), resourceDir);
      app.installTranslator(&translator);
  
-     QTranslator qtTranslator(0);
+     QTranslator qtTranslator;
 -    qtTranslator.load(QLatin1String("qt_") + QLocale::system().name(), resourceDir);
 +    qtTranslator.load(QLatin1String("qt4_") + QLocale::system().name(), resourceDir);
      app.installTranslator(&qtTranslator);
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/qt4-build-lib-static.patch?r1=1.5&r2=1.6&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/qt4-locale.patch?r1=1.12&r2=1.13&f=u