From 26825e2141a1f954936b0351ac36f72fc6a53354 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 15 Mar 2013 17:33:29 +0100 Subject: [PATCH] make bootstrapping of qdoc optional the weird QLibraryInfo dependency is gone. Change-Id: Iebaa5af6bc529999a2415b2ce3d2a5dca362dd5a Reviewed-by: Thiago Macieira --- src/src.pro | 3 ++- src/tools/qdoc/qdoc.pro | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/src.pro b/src/src.pro index f775736406..b4c96025c1 100644 --- a/src/src.pro +++ b/src/src.pro @@ -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 diff --git a/src/tools/qdoc/qdoc.pro b/src/tools/qdoc/qdoc.pro index ebf02b6a14..3bd11bcd5b 100644 --- a/src/tools/qdoc/qdoc.pro +++ b/src/tools/qdoc/qdoc.pro @@ -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 \