whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make bootstrapping of qdoc optional 

the weird QLibraryInfo dependency is gone.

Change-Id: Iebaa5af6bc529999a2415b2ce3d2a5dca362dd5a
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
bb10
Oswald Buddenhagen 2013-03-15 17:33:29 +01:00 committed by The Qt Project
parent a84af7425c
commit 26825e2141
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/src.pro
View File

@ -18,7 +18,8 @@ else: src_tools_uic.depends = src_corelib
src_tools_qdoc.subdir = tools/qdoc
src_tools_qdoc.target = sub-qdoc
src_tools_qdoc.depends = src_tools_bootstrap
force_bootstrap: src_tools_qdoc.depends = src_tools_bootstrap
else: src_tools_qdoc.depends = src_corelib src_xml
src_tools_bootstrap_dbus.subdir = tools/bootstrap-dbus
src_tools_bootstrap_dbus.target = sub-bootstrap_dbus

3
src/tools/qdoc/qdoc.pro
View File

@ -1,7 +1,8 @@
option(host_build)
CONFIG += force_bootstrap # because of weird QLibraryInfo::location() reference
QT = core xml
DEFINES += \
QT_QMLDEVTOOLS_LIB \ # force static exports even if not bootstrapping
QDOC2_COMPAT
INCLUDEPATH += $$QT_SOURCE_TREE/src/tools/qdoc \