]>
Commit | Line | Data |
---|---|---|
c57a122a AM |
1 | 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 |
2 | --- qt-everywhere-opensource-src-4.6.0-beta1/tools/assistant/lib/lib.pro 2009-10-13 17:34:08.000000000 +0200 | |
3 | +++ qt-everywhere-opensource-src-4.6.0-beta1.new/tools/assistant/lib/lib.pro 2009-10-18 10:39:24.621596267 +0200 | |
4 | @@ -5,6 +5,11 @@ | |
8f8a604b | 5 | TARGET = QtHelp |
c57a122a AM |
6 | DEFINES += QHELP_LIB \ |
7 | QT_CLUCENE_SUPPORT | |
8 | + | |
4064b17a KK |
9 | +!contains(CONFIG, static) { |
10 | + CONFIG += dll | |
11 | +} | |
12 | + | |
c57a122a AM |
13 | CONFIG += qt \ |
14 | warn_on | |
8f8a604b | 15 | include(../../../src/qbase.pri) |
c57a122a AM |
16 | Tylko w qt-everywhere-opensource-src-4.6.0-beta1.new/tools/assistant/lib: lib.pro~ |
17 | 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 | |
18 | --- qt-everywhere-opensource-src-4.6.0-beta1/tools/designer/src/uitools/uitools.pro 2009-10-13 17:34:08.000000000 +0200 | |
19 | +++ qt-everywhere-opensource-src-4.6.0-beta1.new/tools/designer/src/uitools/uitools.pro 2009-10-18 10:40:38.624930212 +0200 | |
4064b17a KK |
20 | @@ -1,7 +1,7 @@ |
21 | TEMPLATE = lib | |
c57a122a | 22 | TARGET = $$qtLibraryTarget(QtUiTools) |
4064b17a KK |
23 | QT += xml |
24 | -CONFIG += qt staticlib | |
25 | +CONFIG += qt | |
26 | DESTDIR = ../../../../lib | |
27 | DLLDESTDIR = ../../../../bin | |
28 | ||
c57a122a AM |
29 | @@ -22,11 +22,20 @@ |
30 | QMAKE_TARGET_PRODUCT = UiLoader | |
4064b17a | 31 | QMAKE_TARGET_DESCRIPTION = QUiLoader |
4064b17a KK |
32 | |
33 | +!contains(CONFIG, static) { | |
34 | + CONFIG += dll | |
35 | +} else { | |
36 | + CONFIG += staticlib | |
37 | +} | |
38 | + | |
39 | include(../lib/uilib/uilib.pri) | |
40 | ||
41 | HEADERS += quiloader.h | |
c57a122a AM |
42 | SOURCES += quiloader.cpp |
43 | ||
44 | +target.path=$$[QT_INSTALL_LIBS] | |
45 | +INSTALLS += target | |
46 | + | |
47 | include($$QT_BUILD_TREE/include/QtUiTools/headers.pri, "", true) | |
48 | quitools_headers.files = $$SYNCQT.HEADER_FILES $$SYNCQT.HEADER_CLASSES | |
49 | quitools_headers.path = $$[QT_INSTALL_HEADERS]/QtUiTools | |
50 | Tylko w qt-everywhere-opensource-src-4.6.0-beta1.new/tools/designer/src/uitools: uitools.pro~ |