From a81b39934567e46addb9cb822fbaf71e6ffa9ee4 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Mon, 29 Aug 2016 10:06:49 +0200 Subject: Compile uic and qdbusxml2cpp more often against libbootstrap Otherwise, those tools do not compile in configurations which exclude features that these tools require (e.g., -no-feature-textcodec). Change-Id: I9f27257221755a35a48ae2efa9df63f1a319118e Reviewed-by: Lars Knoll Reviewed-by: Oswald Buddenhagen --- src/tools/qdbusxml2cpp/qdbusxml2cpp.pro | 2 ++ src/tools/uic/uic.pro | 2 ++ 2 files changed, 4 insertions(+) (limited to 'src/tools') diff --git a/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro b/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro index cb14db5fef..d9ee5de0be 100644 --- a/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro +++ b/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro @@ -1,4 +1,6 @@ option(host_build) +!force_bootstrap:!qtConfig(commandlineparser): \ + CONFIG += force_bootstrap QT = core-private force_bootstrap: QT += bootstrap_dbus-private else: QT += dbus-private diff --git a/src/tools/uic/uic.pro b/src/tools/uic/uic.pro index 8008dde07a..9afb2d847f 100644 --- a/src/tools/uic/uic.pro +++ b/src/tools/uic/uic.pro @@ -1,4 +1,6 @@ option(host_build) +!force_bootstrap:if(!qtConfig(commandlineparser)|!qtConfig(textcodec)): \ + CONFIG += force_bootstrap DEFINES += QT_UIC QT_NO_CAST_FROM_ASCII QT_NO_FOREACH -- cgit v1.2.3