1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix build from scratch on Windows.

Browse Source 
idc needs corelib (should be moved to ActiveQt later).
This commit is contained in:
Friedemann Kleint 2011-05-24 11:01:33 +02:00
parent 52c987cc30
commit 82895982ec
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/src.pro
View File

@ -5,7 +5,12 @@ unset(SRC_SUBDIRS)
win32:SRC_SUBDIRS += src_winmain win32:SRC_SUBDIRS += src_winmain
symbian:SRC_SUBDIRS += src_s60main symbian:SRC_SUBDIRS += src_s60main
!wince*:!symbian-abld:!symbian-sbsv2:include(tools/tools.pro) !wince*:!symbian-abld:!symbian-sbsv2:include(tools/tools.pro)
SRC_SUBDIRS += src_corelib src_network src_sql src_gui src_xml src_uitools src_widgets src_testlib SRC_SUBDIRS += src_corelib
# TODO: Move idc to ActiveQt
!cross_compile {
win32:!wince*: SRC_SUBDIRS += src_tools_idc
}
SRC_SUBDIRS += src_network src_sql src_gui src_xml src_uitools src_widgets src_testlib
nacl: SRC_SUBDIRS -= src_network src_testlib nacl: SRC_SUBDIRS -= src_network src_testlib
!symbian:contains(QT_CONFIG, dbus):SRC_SUBDIRS += src_dbus !symbian:contains(QT_CONFIG, dbus):SRC_SUBDIRS += src_dbus
contains(QT_CONFIG, no-gui): SRC_SUBDIRS -= src_gui contains(QT_CONFIG, no-gui): SRC_SUBDIRS -= src_gui

4
src/tools/tools.pro
View File

@ -2,10 +2,6 @@ TEMPLATE = subdirs
TOOLS_SUBDIRS = src_tools_bootstrap src_tools_moc src_tools_rcc TOOLS_SUBDIRS = src_tools_bootstrap src_tools_moc src_tools_rcc
!contains(QT_CONFIG, no-gui): TOOLS_SUBDIRS += src_tools_uic !contains(QT_CONFIG, no-gui): TOOLS_SUBDIRS += src_tools_uic
!cross_compile {
win32:!wince*: SRC_SUBDIRS += src_tools_idc
}
# Set subdir and respective target name # Set subdir and respective target name
src_tools_bootstrap.subdir = $$QT_SOURCE_TREE/src/tools/bootstrap src_tools_bootstrap.subdir = $$QT_SOURCE_TREE/src/tools/bootstrap
src_tools_bootstrap.target = sub-tools-bootstrap src_tools_bootstrap.target = sub-tools-bootstrap