]> git.pld-linux.org Git - packages/qt4.git/blob - qt4-build-lib-static.patch
- fix install libQtUiTools*
[packages/qt4.git] / qt4-build-lib-static.patch
1 --- qt-x11-opensource-src-4.1.0/tools/assistant/lib/lib.pro.orig        2006-02-13 07:13:58.000000000 +0100
2 +++ qt-x11-opensource-src-4.1.0/tools/assistant/lib/lib.pro     2006-02-13 07:39:59.000000000 +0100
3 @@ -4,7 +4,6 @@
4  VERSION                = 1.0
5  
6  CONFIG                += qt warn_on
7 -CONFIG                += dll
8  mac:unix:CONFIG       += explicitlib
9  
10  HEADERS         = qassistantclient.h
11 @@ -17,6 +16,10 @@
12          QMAKE_CXXFLAGS += $$QMAKE_CXXFLAGS_SHLIB
13  }
14  
15 +!contains(CONFIG, static) {
16 +    CONFIG += dll
17 +}
18 +
19  !debug_and_release|build_pass {
20     CONFIG(debug, debug|release) {
21        unix:TARGET = $$member(TARGET, 0)_debug
22 --- qt-x11-opensource-src-4.1.0/tools/designer/src/uitools/uitools.pro.orig     2005-12-16 12:52:20.000000000 +0100
23 +++ qt-x11-opensource-src-4.1.0/tools/designer/src/uitools/uitools.pro  2006-02-13 09:26:05.000000000 +0100
24 @@ -1,7 +1,7 @@
25  TEMPLATE = lib
26  TARGET = QtUiTools
27  QT += xml
28 -CONFIG += qt staticlib
29 +CONFIG += qt
30  DESTDIR = ../../../../lib
31  DLLDESTDIR = ../../../../bin
32  
33 @@ -21,6 +21,12 @@
34  QMAKE_TARGET_DESCRIPTION = QUiLoader
35  QMAKE_TARGET_COPYRIGHT = Copyright (c) 2003-2005 Trolltech
36  
37 +!contains(CONFIG, static) {
38 +    CONFIG += dll
39 +} else {
40 +    CONFIG += staticlib
41 +}
42 +
43  include(../lib/uilib/uilib.pri)
44  
45  HEADERS += quiloader.h
46 @@ -32,6 +32,9 @@
47  HEADERS += quiloader.h
48  SOURCES += quiloader.cpp
49  
50 +target.path=$$[QT_INSTALL_LIBS]
51 +INSTALLS        += target
52 +
53  include($$QT_SOURCE_TREE/include/QtUiTools/headers.pri)
54  quitools_headers.files = $$SYNCQT.HEADER_FILES $$SYNCQT.HEADER_CLASSES
55  quitools_headers.path = $$[QT_INSTALL_HEADERS]/QtUiTools
This page took 0.03243 seconds and 4 git commands to generate.