diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-03-08 22:23:30 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-14 19:49:38 +0100 |
| commit | d3d8ac354665687bd7c96e3f4b3c8b7e0d9c3172 (patch) | |
| tree | d8787576dddd28d64559569997953ed9d677f37f /src/tools | |
| parent | 53571e02a1bb1c65ceb44444050af4526da0ff3a (diff) | |
don't bootstrap tools when not necessary
bootstrapping is only necessary if we are cross-compiling or have a
circular build dependency.
Change-Id: I17244457652ca9d4fc797043e57070c2ae3ee5d1
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/moc/moc.pro | 1 | ||||
| -rw-r--r-- | src/tools/qdbuscpp2xml/qdbuscpp2xml.pro | 4 | ||||
| -rw-r--r-- | src/tools/qdbusxml2cpp/qdbusxml2cpp.pro | 4 | ||||
| -rw-r--r-- | src/tools/qdoc/qdoc.pro | 1 | ||||
| -rw-r--r-- | src/tools/rcc/rcc.pro | 1 |
5 files changed, 9 insertions, 2 deletions
diff --git a/src/tools/moc/moc.pro b/src/tools/moc/moc.pro index 3a6fd2a02d..d56c2805eb 100644 --- a/src/tools/moc/moc.pro +++ b/src/tools/moc/moc.pro @@ -1,4 +1,5 @@ option(host_build) +CONFIG += force_bootstrap DEFINES += QT_MOC QT_NO_CAST_FROM_ASCII QT_NO_CAST_FROM_BYTEARRAY QT_NO_COMPRESS diff --git a/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro b/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro index 96686e7cad..655158e457 100644 --- a/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro +++ b/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro @@ -1,5 +1,7 @@ option(host_build) -QT += bootstrap_dbus-private +QT = core-private +force_bootstrap: QT += bootstrap_dbus-private +else: QT += dbus-private DEFINES += QT_NO_CAST_FROM_ASCII QMAKE_CXXFLAGS += $$QT_CFLAGS_DBUS diff --git a/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro b/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro index 6174cc0c25..dcc36c7913 100644 --- a/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro +++ b/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro @@ -1,5 +1,7 @@ option(host_build) -QT += bootstrap_dbus-private +QT = core-private +force_bootstrap: QT += bootstrap_dbus-private +else: QT += dbus-private DEFINES += QT_NO_CAST_FROM_ASCII QMAKE_CXXFLAGS += $$QT_CFLAGS_DBUS diff --git a/src/tools/qdoc/qdoc.pro b/src/tools/qdoc/qdoc.pro index cd792e73e8..9db77b7b24 100644 --- a/src/tools/qdoc/qdoc.pro +++ b/src/tools/qdoc/qdoc.pro @@ -1,4 +1,5 @@ option(host_build) +CONFIG += force_bootstrap # because of weird QLibraryInfo::location() reference DEFINES += QDOC2_COMPAT \ QT_CRYPTOGRAPHICHASH_ONLY_SHA1 diff --git a/src/tools/rcc/rcc.pro b/src/tools/rcc/rcc.pro index f4ad2f63d7..354747db01 100644 --- a/src/tools/rcc/rcc.pro +++ b/src/tools/rcc/rcc.pro @@ -1,4 +1,5 @@ option(host_build) +CONFIG += force_bootstrap DEFINES += QT_RCC QT_NO_CAST_FROM_ASCII |