- really disable openvg

[packages/qt4.git] / qt4-build-lib-static.patch

diff --git a/qt4-build-lib-static.patch b/qt4-build-lib-static.patch
index 277e52fbbeb8c0130ea701a672c8bda7c2b644ea..49fa567b7e417bd047fd07253e25e8390e14aa51 100644 (file)
--- a/qt4-build-lib-static.patch
+++ b/qt4-build-lib-static.patch
@@ -1,30 +1,34 @@
---- 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
-@@ -2,6 +2,10 @@
- TEMPLATE = lib
+diff -ur qt-everywhere-opensource-src-4.6.0-beta1/tools/assistant/lib/lib.pro qt-everywhere-opensource-src-4.6.0-beta1.new/tools/assistant/lib/lib.pro
+--- qt-everywhere-opensource-src-4.6.0-beta1/tools/assistant/lib/lib.pro       2009-10-13 17:34:08.000000000 +0200
++++ qt-everywhere-opensource-src-4.6.0-beta1.new/tools/assistant/lib/lib.pro   2009-10-18 10:39:24.621596267 +0200
+@@ -5,6 +5,11 @@
  TARGET = QtHelp
- DEFINES += QHELP_LIB QT_CLUCENE_SUPPORT
+ DEFINES += QHELP_LIB \
+     QT_CLUCENE_SUPPORT
++
 +!contains(CONFIG, static) {
 +    CONFIG += dll
 +}
 +
- CONFIG += qt warn_on
- 
+ 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
+Tylko w qt-everywhere-opensource-src-4.6.0-beta1.new/tools/assistant/lib: lib.pro~
+diff -ur qt-everywhere-opensource-src-4.6.0-beta1/tools/designer/src/uitools/uitools.pro qt-everywhere-opensource-src-4.6.0-beta1.new/tools/designer/src/uitools/uitools.pro
+--- qt-everywhere-opensource-src-4.6.0-beta1/tools/designer/src/uitools/uitools.pro    2009-10-13 17:34:08.000000000 +0200
++++ qt-everywhere-opensource-src-4.6.0-beta1.new/tools/designer/src/uitools/uitools.pro        2009-10-18 10:40:38.624930212 +0200
 @@ -1,7 +1,7 @@
  TEMPLATE = lib
- TARGET = QtUiTools
+ TARGET = $$qtLibraryTarget(QtUiTools)
  QT += xml
 -CONFIG += qt staticlib
 +CONFIG += qt
  DESTDIR = ../../../../lib
  DLLDESTDIR = ../../../../bin
  
-@@ -21,6 +21,12 @@
+@@ -22,11 +22,20 @@
+ QMAKE_TARGET_PRODUCT = UiLoader
  QMAKE_TARGET_DESCRIPTION = QUiLoader
- QMAKE_TARGET_COPYRIGHT = Copyright (c) 2003-2005 Trolltech
  
 +!contains(CONFIG, static) {
 +    CONFIG += dll
@@ -35,13 +39,12 @@
  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)
+ include($$QT_BUILD_TREE/include/QtUiTools/headers.pri, "", true)
  quitools_headers.files = $$SYNCQT.HEADER_FILES $$SYNCQT.HEADER_CLASSES
  quitools_headers.path = $$[QT_INSTALL_HEADERS]/QtUiTools
+Tylko w qt-everywhere-opensource-src-4.6.0-beta1.new/tools/designer/src/uitools: uitools.pro~