SOURCES: qt4-build-lib-static.patch (NEW) - fixed static/shared

[charles]

Author: charles                      Date: Mon Feb 13 12:28:41 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- fixed static/shared

---- Files affected:
SOURCES:
   qt4-build-lib-static.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: SOURCES/qt4-build-lib-static.patch
diff -u /dev/null SOURCES/qt4-build-lib-static.patch:1.1
--- /dev/null	Mon Feb 13 13:28:41 2006
+++ SOURCES/qt4-build-lib-static.patch	Mon Feb 13 13:28:36 2006
@@ -0,0 +1,45 @@
+--- 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 @@
+ VERSION                = 1.0
+ 
+ CONFIG                += qt warn_on
+-CONFIG                += dll
+ mac:unix:CONFIG       += explicitlib
+ 
+ HEADERS         = qassistantclient.h
+@@ -17,6 +16,10 @@
+         QMAKE_CXXFLAGS += $$QMAKE_CXXFLAGS_SHLIB
+ }
+ 
++!contains(CONFIG, static) {
++    CONFIG += dll
++}
++
+ !debug_and_release|build_pass {
+    CONFIG(debug, debug|release) {
+       unix:TARGET = $$member(TARGET, 0)_debug
+--- 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 @@
+ TEMPLATE = lib
+ TARGET = QtUiTools
+ QT += xml
+-CONFIG += qt staticlib
++CONFIG += qt
+ DESTDIR = ../../../../lib
+ DLLDESTDIR = ../../../../bin
+ 
+@@ -21,6 +21,12 @@
+ QMAKE_TARGET_DESCRIPTION = QUiLoader
+ QMAKE_TARGET_COPYRIGHT = Copyright (c) 2003-2005 Trolltech
+ 
++!contains(CONFIG, static) {
++    CONFIG += dll
++} else {
++    CONFIG += staticlib
++}
++
+ include(../lib/uilib/uilib.pri)
+ 
+ HEADERS += quiloader.h
================================================================