From a9a306323061ae780631f0ca7d1ada7ac16dd32c Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 18 Oct 2013 12:18:07 +0200 Subject: simplify host_build logic again qt_tool handles bootstrapping fully automatically. This reverts commit 0fc040ef70513ccaeb9e96f7ca05a3df4d6c7879, and adds some more. Change-Id: Icffcf7f487dbf660678c7ee622f94b1063fef7e3 Reviewed-by: Joerg Bornemann --- tools/qmlimportscanner/qmlimportscanner.pro | 8 +------- tools/qmlmin/qmlmin.pro | 10 +--------- 2 files changed, 2 insertions(+), 16 deletions(-) (limited to 'tools') diff --git a/tools/qmlimportscanner/qmlimportscanner.pro b/tools/qmlimportscanner/qmlimportscanner.pro index 9c0468adaf..c8e458c6ae 100644 --- a/tools/qmlimportscanner/qmlimportscanner.pro +++ b/tools/qmlimportscanner/qmlimportscanner.pro @@ -1,12 +1,6 @@ option(host_build) -force_bootstrap { - QT = bootstrap-private -} else { - QT = core -} - -QT += qmldevtools-private +QT = core qmldevtools-private DEFINES += QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII SOURCES += main.cpp diff --git a/tools/qmlmin/qmlmin.pro b/tools/qmlmin/qmlmin.pro index 0b5ef2baee..2cbf196863 100644 --- a/tools/qmlmin/qmlmin.pro +++ b/tools/qmlmin/qmlmin.pro @@ -1,13 +1,5 @@ option(host_build) - -force_bootstrap { - QT = bootstrap-private -} else { - QT = core -} - -QT += qmldevtools-private - +QT = core qmldevtools-private SOURCES += main.cpp load(qt_tool) -- cgit v1.2.3