diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-10-18 12:18:07 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-25 18:54:35 +0200 |
| commit | a9a306323061ae780631f0ca7d1ada7ac16dd32c (patch) | |
| tree | efc14872e6e6967bf7800e6b6d4f7d40394a5585 | |
| parent | 113f4bc2799285f2565b69a2886dba12b2550798 (diff) | |
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 <joerg.bornemann@digia.com>
| -rw-r--r-- | src/qmldevtools/qmldevtools.pro | 8 | ||||
| -rw-r--r-- | tools/qmlimportscanner/qmlimportscanner.pro | 8 | ||||
| -rw-r--r-- | tools/qmlmin/qmlmin.pro | 10 |
3 files changed, 3 insertions, 23 deletions
diff --git a/src/qmldevtools/qmldevtools.pro b/src/qmldevtools/qmldevtools.pro index 633105273a..963fb1be5a 100644 --- a/src/qmldevtools/qmldevtools.pro +++ b/src/qmldevtools/qmldevtools.pro @@ -1,12 +1,6 @@ option(host_build) TARGET = QtQmlDevTools - -force_bootstrap { - QT = bootstrap-private -} else { - QT = core -} - +QT = core CONFIG += static no_module_headers internal_module MODULE_INCLUDES = \ 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) |