SOURCES: qt4-buildsystem.patch, qt4-tools.patch - updated for 4.0.1.

[pluto]

Author: pluto                        Date: Mon Aug 22 13:00:55 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated for 4.0.1.

---- Files affected:
SOURCES:
   qt4-buildsystem.patch (1.4 -> 1.5) , qt4-tools.patch (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: SOURCES/qt4-buildsystem.patch
diff -u SOURCES/qt4-buildsystem.patch:1.4 SOURCES/qt4-buildsystem.patch:1.5
--- SOURCES/qt4-buildsystem.patch:1.4	Mon May 16 14:39:06 2005
+++ SOURCES/qt4-buildsystem.patch	Mon Aug 22 15:00:49 2005
@@ -15,15 +15,14 @@
 
 --- qt-copy/tools/assistant/lib/lib.pro.orig	2005-05-13 16:39:04.000000000 +0200
 +++ qt-copy/tools/assistant/lib/lib.pro	2005-05-13 20:21:32.014137768 +0200
-@@ -4,9 +4,9 @@
+@@ -4,9 +4,8 @@
  VERSION                = 1.0
  
  CONFIG                += qt warn_on
--CONFIG                += staticlib debug_and_release 
-+CONFIG                += dll debug_and_release 
+-CONFIG                += staticlib debug_and_release
++CONFIG                += dll debug_and_release
  mac:unix:CONFIG       += explicitlib
 -CONFIG                -= dll
-+
  
  HEADERS         = qassistantclient.h
  SOURCES         = qassistantclient.cpp

================================================================
Index: SOURCES/qt4-tools.patch
diff -u SOURCES/qt4-tools.patch:1.3 SOURCES/qt4-tools.patch:1.4
--- SOURCES/qt4-tools.patch:1.3	Thu Jun 16 21:20:09 2005
+++ SOURCES/qt4-tools.patch	Mon Aug 22 15:00:50 2005
@@ -7,6 +7,6 @@
 -			porting
 +			porting \
 +			qvfb
-     !contains(QT_PRODUCT, .*Console.*):SUBDIRS += designer
+     !contains(QT_EDITION, Console):SUBDIRS += designer
      unix:SUBDIRS        += qtconfig
  }
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/qt4-buildsystem.patch?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/SOURCES/qt4-tools.patch?r1=1.3&r2=1.4&f=u