equal
deleted
inserted
replaced
23 QT_NO_STL \ |
23 QT_NO_STL \ |
24 QT_NO_SYSTEMLOCALE \ |
24 QT_NO_SYSTEMLOCALE \ |
25 QT_NO_TEXTSTREAM \ |
25 QT_NO_TEXTSTREAM \ |
26 QT_NO_THREAD \ |
26 QT_NO_THREAD \ |
27 QT_NO_UNICODETABLES \ |
27 QT_NO_UNICODETABLES \ |
28 QT_NO_USING_NAMESPACE |
28 QT_NO_USING_NAMESPACE \ |
|
29 QT_QCHAR_CONSTRUCTOR |
29 win32:DEFINES += QT_NODLL |
30 win32:DEFINES += QT_NODLL |
30 |
31 |
31 INCLUDEPATH += $$QT_BUILD_TREE/include \ |
32 INCLUDEPATH += $$QT_BUILD_TREE/include \ |
32 $$QT_BUILD_TREE/include/QtCore \ |
33 $$QT_BUILD_TREE/include/QtCore \ |
33 $$QT_BUILD_TREE/include/QtXml |
34 $$QT_BUILD_TREE/include/QtXml |
93 QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.4 #enables weak linking for 10.4 (exported) |
94 QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.4 #enables weak linking for 10.4 (exported) |
94 SOURCES += ../../corelib/kernel/qcore_mac.cpp |
95 SOURCES += ../../corelib/kernel/qcore_mac.cpp |
95 LIBS += -framework CoreServices |
96 LIBS += -framework CoreServices |
96 } |
97 } |
97 |
98 |
98 contains(QT_CONFIG, zlib) { |
99 contains(QT_CONFIG, zlib)|cross_compile { |
99 INCLUDEPATH += ../../3rdparty/zlib |
100 INCLUDEPATH += ../../3rdparty/zlib |
100 SOURCES+= \ |
101 SOURCES+= \ |
101 ../3rdparty/zlib/adler32.c \ |
102 ../3rdparty/zlib/adler32.c \ |
102 ../3rdparty/zlib/compress.c \ |
103 ../3rdparty/zlib/compress.c \ |
103 ../3rdparty/zlib/crc32.c \ |
104 ../3rdparty/zlib/crc32.c \ |
111 ../3rdparty/zlib/zutil.c |
112 ../3rdparty/zlib/zutil.c |
112 } |
113 } |
113 |
114 |
114 lib.CONFIG = dummy_install |
115 lib.CONFIG = dummy_install |
115 INSTALLS += lib |
116 INSTALLS += lib |
|
117 |
|
118 # Make dummy "sis" and "freeze" target to keep recursive "make sis/freeze" working. |
|
119 sis_target.target = sis |
|
120 sis_target.commands = |
|
121 sis_target.depends = first |
|
122 QMAKE_EXTRA_TARGETS += sis_target |
|
123 freeze_target.target = freeze |
|
124 freeze_target.commands = |
|
125 freeze_target.depends = first |
|
126 QMAKE_EXTRA_TARGETS += freeze_target |