Changeset 561 for trunk/src/src.pro


Ignore:
Timestamp:
Feb 11, 2010, 11:19:06 PM (15 years ago)
Author:
Dmitry A. Kuminov
Message:

trunk: Merged in qt 4.6.1 sources.

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/src/src.pro

    r252 r561  
    55win32:SRC_SUBDIRS += src_winmain
    66wince*:{
    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
    810} 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)
    1114    contains(QT_CONFIG, dbus):SRC_SUBDIRS += src_dbus
    12     !cross_compile {
    13         contains(QT_CONFIG, qt3support): SRC_SUBDIRS += src_tools_uic3
    14     }
    1515}
    16 win32:!contains(QT_EDITION, OpenSource|Console): {
    17     SRC_SUBDIRS += src_activeqt
    18     !wince*: SRC_SUBDIRS += src_tools_idc
    19 }
     16win32:SRC_SUBDIRS += src_activeqt
    2017
    2118contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, opengles2): SRC_SUBDIRS += src_opengl
     19contains(QT_CONFIG, openvg): SRC_SUBDIRS += src_openvg
    2220contains(QT_CONFIG, xmlpatterns): SRC_SUBDIRS += src_xmlpatterns
    2321contains(QT_CONFIG, phonon): SRC_SUBDIRS += src_phonon
     22contains(QT_CONFIG, multimedia): SRC_SUBDIRS += src_multimedia
    2423contains(QT_CONFIG, svg): SRC_SUBDIRS += src_svg
    2524contains(QT_CONFIG, webkit)  {
     
    2726    SRC_SUBDIRS += src_webkit
    2827}
     28contains(QT_CONFIG, script): SRC_SUBDIRS += src_script
    2929contains(QT_CONFIG, scripttools): SRC_SUBDIRS += src_scripttools
     30contains(QT_CONFIG, declarative): SRC_SUBDIRS += src_declarative
    3031SRC_SUBDIRS += src_plugins
    3132
    3233os2:SRC_SUBDIRS += src_xsystray
    3334
     35src_s60main.subdir = $$QT_SOURCE_TREE/src/s60main
     36src_s60main.target = sub-s60main
     37src_s60installs.subdir = $$QT_SOURCE_TREE/src/s60installs
     38src_s60installs.target = sub-s60installs
    3439src_winmain.subdir = $$QT_SOURCE_TREE/src/winmain
    3540src_winmain.target = sub-winmain
    36 src_tools_bootstrap.subdir = $$QT_SOURCE_TREE/src/tools/bootstrap
    37 src_tools_bootstrap.target = sub-tools-bootstrap
    38 src_tools_moc.subdir = $$QT_SOURCE_TREE/src/tools/moc
    39 src_tools_moc.target = sub-moc
    40 src_tools_rcc.subdir = $$QT_SOURCE_TREE/src/tools/rcc
    41 src_tools_rcc.target = sub-rcc
    42 src_tools_uic.subdir = $$QT_SOURCE_TREE/src/tools/uic
    43 src_tools_uic.target = sub-uic
    4441src_corelib.subdir = $$QT_SOURCE_TREE/src/corelib
    4542src_corelib.target = sub-corelib
     
    6461src_opengl.subdir = $$QT_SOURCE_TREE/src/opengl
    6562src_opengl.target = sub-opengl
     63src_openvg.subdir = $$QT_SOURCE_TREE/src/openvg
     64src_openvg.target = sub-openvg
    6665src_qt3support.subdir = $$QT_SOURCE_TREE/src/qt3support
    6766src_qt3support.target = sub-qt3support
    6867src_phonon.subdir = $$QT_SOURCE_TREE/src/phonon
    6968src_phonon.target = sub-phonon
    70 src_tools_uic3.subdir = $$QT_SOURCE_TREE/src/tools/uic3
    71 src_tools_uic3.target = sub-uic3
     69src_multimedia.subdir = $$QT_SOURCE_TREE/src/multimedia
     70src_multimedia.target = sub-multimedia
    7271src_activeqt.subdir = $$QT_SOURCE_TREE/src/activeqt
    7372src_activeqt.target = sub-activeqt
    74 src_tools_idc.subdir = $$QT_SOURCE_TREE/src/tools/idc
    75 src_tools_idc.target = sub-idc
    7673src_plugins.subdir = $$QT_SOURCE_TREE/src/plugins
    7774src_plugins.target = sub-plugins
     
    8279src_webkit.subdir = $$QT_SOURCE_TREE/src/3rdparty/webkit/WebCore
    8380src_webkit.target = sub-webkit
     81src_declarative.subdir = $$QT_SOURCE_TREE/src/declarative
     82src_declarative.target = sub-declarative
    8483src_xsystray.subdir = $$QT_SOURCE_TREE/src/3rdparty/os2/xsystray
    8584src_xsystray.target = sub-xsystray
    8685
    8786#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 {
    9288   src_corelib.depends = src_tools_moc src_tools_rcc
    9389   src_gui.depends = src_corelib src_tools_uic
     
    10197   src_network.depends = src_corelib
    10298   src_opengl.depends = src_gui
     99   src_openvg.depends = src_gui
    103100   src_sql.depends = src_corelib
    104101   src_testlib.depends = src_corelib
    105102   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
    106105   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
    109107   src_tools_activeqt.depends = src_tools_idc src_gui
     108   src_declarative.depends = src_xml src_gui src_script src_network src_svg
    110109   src_plugins.depends = src_gui src_sql src_svg
    111110   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
    113114      #exists($$QT_SOURCE_TREE/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro): src_webkit.depends += src_javascriptcore
    114115   }
     
    118119      src_phonon.depends +=  src_dbus
    119120   }
     121   contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, opengles2): src_plugins.depends += src_opengl
    120122}
    121123
     124!symbian {
    122125# This creates a sub-src rule
    123126sub_src_target.CONFIG = recursive
    124 sub_src_target.recurse = $$SRC_SUBDIRS
     127sub_src_target.recurse = $$TOOLS_SUBDIRS $$SRC_SUBDIRS
    125128sub_src_target.target = sub-src
    126129sub_src_target.recurse_target =
     
    128131
    129132# This gives us a top level debug/release
    130 EXTRA_DEBUG_TARGETS =
    131 EXTRA_RELEASE_TARGETS =
    132133for(subname, SRC_SUBDIRS) {
    133134   subdir = $$subname
     
    168169release.depends = $$EXTRA_RELEASE_TARGETS
    169170QMAKE_EXTRA_TARGETS += debug release
     171}
    170172
    171173SUBDIRS += $$SRC_SUBDIRS
    172 
Note: See TracChangeset for help on using the changeset viewer.