]> git.pld-linux.org Git - packages/qt4.git/commitdiff
projects / packages / qt4.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: a4a26ac)
- merged devel
authordjurban <djurban@pld-linux.org>
Sun, 31 Aug 2003 13:52:42 +0000 (13:52 +0000)
committercvs2git <feedback@pld-linux.org>
Sun, 24 Jun 2012 12:13:13 +0000 (12:13 +0000)
Changed files:
    qt-FHS.patch -> 1.8
    qt-make_use_of_locale.patch -> 1.4
    qt-qmake-nostatic.patch -> 1.3

qt-FHS.patch patch | blob | blame | history
qt-make_use_of_locale.patch patch | blob | blame | history
qt-qmake-nostatic.patch patch | blob | blame | history

diff --git a/qt-FHS.patch b/qt-FHS.patch
index c38e42b5608dd7b4ba8aca3d1370682efabfe159..bda059fb7fcd6a3360383dd22867ff11679657f7 100644 (file)
--- a/qt-FHS.patch
+++ b/qt-FHS.patch
@@ -21,13 +21,14 @@ diff -ur qt-x11-free-3.0.5.orig/tools/designer/designer/newformimpl.cpp qt-x11-f
  <li><p>Right click the form in the Forms list, then click Remove form from project.</p>
  </ol><p>Now that we have the simple template we are ready to use it. Click <b>File|New</b> to invoke the <em>New File</em> dialog. One of the templates that will appear is 'Simple Dialog'. Click the simple dialog, then click <b>OK</b>. A new form will appear with the same widgets and layout as the template. Add any other widgets and functionality. When you attempt to save the form you will be prompted for a new form name.</p>
  <h4><a name="2-2"></a>Base-class Templates</h4>
---- qt-copy/tools/designer/designer/designer.pro.orig  Thu Oct 24 19:17:21 2002
-+++ qt-copy/tools/designer/designer/designer.pro       Thu Oct 24 20:36:22 2002
-@@ -414,6 +414,6 @@
- 
+--- qt-copy/tools/designer/designer/designer.pro~      2003-06-23 18:59:53.000000000 +0200
++++ qt-copy/tools/designer/designer/designer.pro       2003-06-23 20:23:44.000000000 +0200
+@@ -427,7 +427,7 @@
  target.path=$$libs.path
  INSTALLS += target
+ 
 -templates.path=$$data.path/templates
 +templates.path=$$data.path/designer/templates
  templates.files = ../templates/*
  INSTALLS += templates
+ 
diff --git a/qt-make_use_of_locale.patch b/qt-make_use_of_locale.patch
index fe9638bd0197b9db8495c1e333351f396416f6a6..2afe39594804d4920acec6b22c0467a1ab54e1ca 100644 (file)
--- a/qt-make_use_of_locale.patch
+++ b/qt-make_use_of_locale.patch
@@ -5,47 +5,65 @@
  
      QTranslator translator( 0 );
 -    translator.load( QString("assistant_") + QTextCodec::locale(), resourceDir );
-+    translator.load( QString("assistant"), resourceDir + QString("/") + QTextCodec::locale() + QString("/LC_MESSAGES") );
++    translator.load( QString("assistant"), resourceDir + QString("/") + QString::fromLatin1(QTextCodec::locale()) + QString("/LC_MESSAGES") );
      a.installTranslator( &translator );
  
      QTranslator qtTranslator( 0 );
 -    qtTranslator.load( QString("qt_") + QTextCodec::locale(), resourceDir );
-+    qtTranslator.load( QString("qt"), resourceDir + QString("/") + QTextCodec::locale() + QString("/LC_MESSAGES") );
++    qtTranslator.load( QString("qt"), resourceDir + QString("/") + QString::fromLatin1(QTextCodec::locale()) + QString("/LC_MESSAGES") );
      a.installTranslator( &qtTranslator );
  
      Config *conf = Config::loadConfig( profileName );
---- qt-x11-free-3.2.0/tools/linguist/linguist/main.cpp.orig    2003-08-09 14:02:15.000000000 +0200
-+++ qt-x11-free-3.2.0/tools/linguist/linguist/main.cpp 2003-08-09 14:26:55.000000000 +0200
-@@ -42,9 +42,14 @@
+--- qt-x11-free-3.2.0/tools/designer/app/main.cpp.orig 2003-08-12 20:00:11.821715736 +0200
++++ qt-x11-free-3.2.0/tools/designer/app/main.cpp      2003-08-12 19:59:12.017807312 +0200
+@@ -41,6 +41,7 @@
+ #include <qsettings.h>
+ #include <qsplashscreen.h>
+ #include <qdir.h>
++#include <qtextcodec.h>
  
- 
-     QTranslator translator( 0 );
--    translator.load( QString( "linguist_" ) + QTextCodec::locale(), "." );
-+    translator.load( QString( "linguist" ) + QTextCodec::locale(), resourceDir + QString("/") + QTextCodec::locale() + QString("/LC_MESSAGES") );
-     app.installTranslator( &translator );
- 
-+    QTranslator translator( 0 );
-+    translator.load( QString( "qt" ) + QTextCodec::locale(), resourceDir + QString("/") + QTextCodec::locale() + QString("/LC_MESSAGES") );
-+    app.installTranslator( &translator );
-+              
-+
-     bool showSplash = TRUE;
- 
-     QString keybase("/Qt Linguist/3.1/");
---- qt-x11-free-3.2.0/tools/designer/app/main.cpp.orig 2003-05-21 09:13:12.000000000 +0200
-+++ qt-x11-free-3.2.0/tools/designer/app/main.cpp      2003-08-12 09:36:06.090099208 +0200
-@@ -179,6 +179,14 @@
+ #include <stdlib.h>
+ #include <signal.h>
+@@ -179,6 +180,14 @@
        signal( SIGTERM, exitHandler );
      }
  
 +    QString resourceDir = qInstallPathTranslations();
 +    
 +    QTranslator translator( 0 );
-+    translator.load( QString("designer"), resourceDir + QString("/") + QTextCodec::locale() + QString("/LC_MESSAGES") );
++    translator.load( QString("designer"), resourceDir + QString("/") + QString(QTextCodec::locale()) + QString("/LC_MESSAGES") );
 +    a.installTranslator( &translator );
 +    QTranslator qtTranslator( 0 );
-+    qtTranslator.load( QString("qt"), resourceDir + QString("/") + QTextCodec::locale() + QString("/LC_MESSAGES") );
++    qtTranslator.load( QString("qt"), resourceDir + QString("/") + QString(QTextCodec::locale()) + QString("/LC_MESSAGES") );
 +    
      extern void qInitImages_designercore();
      qInitImages_designercore();
  
+--- qt-x11-free-3.2.0/tools/linguist/linguist/main.cpp.orig    2003-05-13 09:08:55.000000000 +0200
++++ qt-x11-free-3.2.0/tools/linguist/linguist/main.cpp 2003-08-12 20:10:04.402629744 +0200
+@@ -34,6 +34,7 @@
+ #include <qtranslator.h>
+ #include <qsettings.h>
+ #include <qsplashscreen.h>
++#include <qtextcodec.h>
+ 
+ int main( int argc, char **argv )
+ {
+@@ -41,10 +42,16 @@
+     QApplication::setOverrideCursor( Qt::waitCursor );
+ 
+ 
++    QString resourceDir = qInstallPathTranslations();
+     QTranslator translator( 0 );
+-    translator.load( QString( "linguist_" ) + QTextCodec::locale(), "." );
++    translator.load( QString( "linguist" ), resourceDir + QString("/") + QString(QTextCodec::locale()) + QString("/LC_MESSAGES") );
+     app.installTranslator( &translator );
+ 
++    QTranslator qttranslator( 0 );
++    qttranslator.load( QString( "qt" ), resourceDir + QString("/") + QString(QTextCodec::locale()) + QString("/LC_MESSAGES") );
++    app.installTranslator( &qttranslator );
++              
++
+     bool showSplash = TRUE;
+ 
+     QString keybase("/Qt Linguist/3.1/");
diff --git a/qt-qmake-nostatic.patch b/qt-qmake-nostatic.patch
index 4bdcf1aa747fd6b92c09faeae1c5c976fa530a58..3bcfc8feebf54a2836aaccba3e0cd98a400da8b8 100644 (file)
--- a/qt-qmake-nostatic.patch
+++ b/qt-qmake-nostatic.patch
@@ -10,8 +10,8 @@
  DEFINES               += QT_INTERNAL_NETWORK
  include( ../../../src/qt_professional.pri )
  
---- qt-x11-free-3.1.2/tools/designer/designer/designer.pro~    Tue Jan 14 18:45:38 2003
-+++ qt-x11-free-3.1.2/tools/designer/designer/designer.pro     Thu Mar  6 22:09:13 2003
+--- qt-copy/tools/designer/designer/designer.pro~      2003-06-23 18:59:53.000000000 +0200
++++ qt-copy/tools/designer/designer/designer.pro       2003-06-23 20:04:18.000000000 +0200
 @@ -1,6 +1,5 @@
  TEMPLATE      = lib
 -CONFIG                += qt warn_on staticlib qmake_cache
@@ -20,15 +20,6 @@
  !force_static:!win32:contains(QT_PRODUCT,qt-internal) {
     CONFIG          -= staticlib
     CONFIG          += dll 
-@@ -416,7 +415,7 @@
- 
- INCLUDEPATH   += ../shared ../uilib
- win32:LIBS    += $$QT_BUILD_TREE/lib/qui.lib $$QT_BUILD_TREE/lib/qassistantclient.lib
--unix:LIBS             += -L$$QT_BUILD_TREE/lib -lqui $$QT_BUILD_TREE/lib/libqassistantclient.a
-+unix:LIBS             += -L$$QT_BUILD_TREE/lib -lqui $$QT_BUILD_TREE/lib/libqassistantclient.so.1.0.0
- 
- TRANSLATIONS  = designer_de.ts designer_fr.ts
- 
 --- qt-x11-free-3.1.1/tools/designer/editor/editor.pro~        Tue Nov 19 22:07:43 2002
 +++ qt-x11-free-3.1.1/tools/designer/editor/editor.pro Wed Mar  5 14:23:47 2003
 @@ -1,6 +1,5 @@
@@ -39,14 +30,3 @@
  HEADERS               = editor.h  \
                  parenmatcher.h  \
                  completion.h \
---- qt-x11-free-3.1.2/tools/designer/plugins/cppeditor/cppeditor.pro~  Tue Jan 14 18:56:20 2003
-+++ qt-x11-free-3.1.2/tools/designer/plugins/cppeditor/cppeditor.pro   Fri Mar  7 07:58:38 2003
-@@ -13,7 +13,7 @@
- win32{
-     LIBS      += $$QT_BUILD_TREE/lib/editor.lib
- } else {
--    LIBS      += -L$$QT_BUILD_TREE/lib $$QT_BUILD_TREE/lib/libeditor.a
-+    LIBS      += -L$$QT_BUILD_TREE/lib $$QT_BUILD_TREE/lib/libeditor.so.1.0.0
- }
- 
- target.path += $$plugins.path/designer
The Qt GUI application framework
This page took 0.116209 seconds and 4 git commands to generate.