SOURCES: qt4-build-lib-static.patch - moved from DEVEL

[arekm]

Author: arekm                        Date: Tue Jun 17 18:00:48 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- moved from DEVEL

---- Files affected:
SOURCES:
   qt4-build-lib-static.patch (1.4 -> 1.5) 

---- Diffs:

================================================================
Index: SOURCES/qt4-build-lib-static.patch
diff -u SOURCES/qt4-build-lib-static.patch:1.4 SOURCES/qt4-build-lib-static.patch:1.5
--- SOURCES/qt4-build-lib-static.patch:1.4	Fri Jun  1 16:10:52 2007
+++ SOURCES/qt4-build-lib-static.patch	Tue Jun 17 20:00:43 2008
@@ -1,24 +1,16 @@
 --- qt-x11-opensource-src-4.1.0/tools/assistant/lib/lib.pro.orig	2006-02-13 07:13:58.000000000 +0100
 +++ qt-x11-opensource-src-4.1.0/tools/assistant/lib/lib.pro	2006-02-13 07:39:59.000000000 +0100
-@@ -4,7 +4,6 @@
- CONFIG                += qt warn_on
- mac|win32:CONFIG                += debug_and_release
- mac:unix:CONFIG       += explicitlib
--CONFIG                += dll
- 
- HEADERS         = qassistantclient.h \
-                   qassistantclient_global.h
-@@ -17,6 +16,10 @@
- }
- 
- DEFINES += QT_ASSISTANT_CLIENT_LIBRARY
+@@ -2,6 +2,10 @@
+ TEMPLATE = lib
+ TARGET = QtHelp
+ DEFINES += QHELP_LIB QT_CLUCENE_SUPPORT
 +!contains(CONFIG, static) {
 +    CONFIG += dll
 +}
 +
- contains(CONFIG, static) {
-     DEFINES += QT_ASSISTANT_CLIENT_STATIC
- }
+ CONFIG += qt warn_on
+ 
+ include(../../../src/qbase.pri)
 --- qt-x11-opensource-src-4.1.0/tools/designer/src/uitools/uitools.pro.orig	2005-12-16 12:52:20.000000000 +0100
 +++ qt-x11-opensource-src-4.1.0/tools/designer/src/uitools/uitools.pro	2006-02-13 09:26:05.000000000 +0100
 @@ -1,7 +1,7 @@
================================================================

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