Changeset 561 for trunk/src/src.pro
- Timestamp:
- Feb 11, 2010, 11:19:06 PM (15 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk
-
Property svn:mergeinfo
set to (toggle deleted branches)
/branches/vendor/nokia/qt/4.6.1 merged eligible /branches/vendor/nokia/qt/current merged eligible /branches/vendor/trolltech/qt/current 3-149
-
Property svn:mergeinfo
set to (toggle deleted branches)
-
trunk/src/src.pro
r252 r561 5 5 win32:SRC_SUBDIRS += src_winmain 6 6 wince*:{ 7 SRC_SUBDIRS += src_corelib src_xml src_gui src_sql src_network src_script src_testlib 7 SRC_SUBDIRS += src_corelib src_xml src_gui src_sql src_network src_testlib 8 } else:symbian { 9 SRC_SUBDIRS += src_s60main src_corelib src_xml src_gui src_network src_sql src_testlib src_s60installs 8 10 } else { 9 SRC_SUBDIRS += src_tools_bootstrap src_tools_moc src_tools_rcc src_tools_uic src_corelib src_xml src_network src_gui src_sql src_script src_testlib 10 contains(QT_CONFIG, qt3support): SRC_SUBDIRS += src_qt3support 11 SRC_SUBDIRS += src_corelib src_xml src_network src_gui src_sql src_testlib 12 !vxworks:contains(QT_CONFIG, qt3support): SRC_SUBDIRS += src_qt3support 13 include(tools/tools.pro) 11 14 contains(QT_CONFIG, dbus):SRC_SUBDIRS += src_dbus 12 !cross_compile {13 contains(QT_CONFIG, qt3support): SRC_SUBDIRS += src_tools_uic314 }15 15 } 16 win32:!contains(QT_EDITION, OpenSource|Console): { 17 SRC_SUBDIRS += src_activeqt 18 !wince*: SRC_SUBDIRS += src_tools_idc 19 } 16 win32:SRC_SUBDIRS += src_activeqt 20 17 21 18 contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, opengles2): SRC_SUBDIRS += src_opengl 19 contains(QT_CONFIG, openvg): SRC_SUBDIRS += src_openvg 22 20 contains(QT_CONFIG, xmlpatterns): SRC_SUBDIRS += src_xmlpatterns 23 21 contains(QT_CONFIG, phonon): SRC_SUBDIRS += src_phonon 22 contains(QT_CONFIG, multimedia): SRC_SUBDIRS += src_multimedia 24 23 contains(QT_CONFIG, svg): SRC_SUBDIRS += src_svg 25 24 contains(QT_CONFIG, webkit) { … … 27 26 SRC_SUBDIRS += src_webkit 28 27 } 28 contains(QT_CONFIG, script): SRC_SUBDIRS += src_script 29 29 contains(QT_CONFIG, scripttools): SRC_SUBDIRS += src_scripttools 30 contains(QT_CONFIG, declarative): SRC_SUBDIRS += src_declarative 30 31 SRC_SUBDIRS += src_plugins 31 32 32 33 os2:SRC_SUBDIRS += src_xsystray 33 34 35 src_s60main.subdir = $$QT_SOURCE_TREE/src/s60main 36 src_s60main.target = sub-s60main 37 src_s60installs.subdir = $$QT_SOURCE_TREE/src/s60installs 38 src_s60installs.target = sub-s60installs 34 39 src_winmain.subdir = $$QT_SOURCE_TREE/src/winmain 35 40 src_winmain.target = sub-winmain 36 src_tools_bootstrap.subdir = $$QT_SOURCE_TREE/src/tools/bootstrap37 src_tools_bootstrap.target = sub-tools-bootstrap38 src_tools_moc.subdir = $$QT_SOURCE_TREE/src/tools/moc39 src_tools_moc.target = sub-moc40 src_tools_rcc.subdir = $$QT_SOURCE_TREE/src/tools/rcc41 src_tools_rcc.target = sub-rcc42 src_tools_uic.subdir = $$QT_SOURCE_TREE/src/tools/uic43 src_tools_uic.target = sub-uic44 41 src_corelib.subdir = $$QT_SOURCE_TREE/src/corelib 45 42 src_corelib.target = sub-corelib … … 64 61 src_opengl.subdir = $$QT_SOURCE_TREE/src/opengl 65 62 src_opengl.target = sub-opengl 63 src_openvg.subdir = $$QT_SOURCE_TREE/src/openvg 64 src_openvg.target = sub-openvg 66 65 src_qt3support.subdir = $$QT_SOURCE_TREE/src/qt3support 67 66 src_qt3support.target = sub-qt3support 68 67 src_phonon.subdir = $$QT_SOURCE_TREE/src/phonon 69 68 src_phonon.target = sub-phonon 70 src_ tools_uic3.subdir = $$QT_SOURCE_TREE/src/tools/uic371 src_ tools_uic3.target = sub-uic369 src_multimedia.subdir = $$QT_SOURCE_TREE/src/multimedia 70 src_multimedia.target = sub-multimedia 72 71 src_activeqt.subdir = $$QT_SOURCE_TREE/src/activeqt 73 72 src_activeqt.target = sub-activeqt 74 src_tools_idc.subdir = $$QT_SOURCE_TREE/src/tools/idc75 src_tools_idc.target = sub-idc76 73 src_plugins.subdir = $$QT_SOURCE_TREE/src/plugins 77 74 src_plugins.target = sub-plugins … … 82 79 src_webkit.subdir = $$QT_SOURCE_TREE/src/3rdparty/webkit/WebCore 83 80 src_webkit.target = sub-webkit 81 src_declarative.subdir = $$QT_SOURCE_TREE/src/declarative 82 src_declarative.target = sub-declarative 84 83 src_xsystray.subdir = $$QT_SOURCE_TREE/src/3rdparty/os2/xsystray 85 84 src_xsystray.target = sub-xsystray 86 85 87 86 #CONFIG += ordered 88 !wince*:!ordered { 89 src_tools_moc.depends = src_tools_bootstrap 90 src_tools_rcc.depends = src_tools_bootstrap 91 src_tools_uic.depends = src_tools_bootstrap 87 !wince*:!symbian:!ordered { 92 88 src_corelib.depends = src_tools_moc src_tools_rcc 93 89 src_gui.depends = src_corelib src_tools_uic … … 101 97 src_network.depends = src_corelib 102 98 src_opengl.depends = src_gui 99 src_openvg.depends = src_gui 103 100 src_sql.depends = src_corelib 104 101 src_testlib.depends = src_corelib 105 102 src_qt3support.depends = src_gui src_xml src_network src_sql 103 src_tools_idc.depends = src_corelib # target defined in tools.pro 104 src_tools_uic3.depends = src_qt3support src_xml # target defined in tools.pro 106 105 src_phonon.depends = src_gui 107 src_tools_uic3.depends = src_qt3support src_xml 108 src_tools_idc.depends = src_corelib 106 src_multimedia.depends = src_gui 109 107 src_tools_activeqt.depends = src_tools_idc src_gui 108 src_declarative.depends = src_xml src_gui src_script src_network src_svg 110 109 src_plugins.depends = src_gui src_sql src_svg 111 110 contains(QT_CONFIG, webkit) { 112 src_webkit.depends = src_gui src_sql src_network src_xml 111 src_webkit.depends = src_gui src_sql src_network src_xml 112 contains(QT_CONFIG, phonon):src_webkit.depends += src_phonon 113 contains(QT_CONFIG, declarative):src_declarative.depends += src_webkit 113 114 #exists($$QT_SOURCE_TREE/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro): src_webkit.depends += src_javascriptcore 114 115 } … … 118 119 src_phonon.depends += src_dbus 119 120 } 121 contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, opengles2): src_plugins.depends += src_opengl 120 122 } 121 123 124 !symbian { 122 125 # This creates a sub-src rule 123 126 sub_src_target.CONFIG = recursive 124 sub_src_target.recurse = $$ SRC_SUBDIRS127 sub_src_target.recurse = $$TOOLS_SUBDIRS $$SRC_SUBDIRS 125 128 sub_src_target.target = sub-src 126 129 sub_src_target.recurse_target = … … 128 131 129 132 # This gives us a top level debug/release 130 EXTRA_DEBUG_TARGETS =131 EXTRA_RELEASE_TARGETS =132 133 for(subname, SRC_SUBDIRS) { 133 134 subdir = $$subname … … 168 169 release.depends = $$EXTRA_RELEASE_TARGETS 169 170 QMAKE_EXTRA_TARGETS += debug release 171 } 170 172 171 173 SUBDIRS += $$SRC_SUBDIRS 172
Note:
See TracChangeset
for help on using the changeset viewer.