diff options
| author | Samuel Rødal <samuel.rodal@digia.com> | 2013-03-21 08:18:12 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-03-21 08:49:01 +0100 |
| commit | 2ab9b747fcc5aa50e8cca758f7780158e734a222 (patch) | |
| tree | 7017007823d54c2d658079e928f7220a1f57a852 /mkspecs/features/qt_tool.prf | |
| parent | f1e681bed21e131864fe1e1c91679f7a56b06823 (diff) | |
| parent | 8bfbaa41783dad66976fc83d4ca8c7e2673f5629 (diff) | |
Merge remote-tracking branch 'gerrit/release' into stable
Conflicts:
configure
mkspecs/features/qt_module_headers.prf
mkspecs/features/qt_tool.prf
src/angle/angle.pro
src/tools/bootstrap/bootstrap.pro
tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
Change-Id: Ide5759fe419a50f1c944211a48f7c66f662684e0
Diffstat (limited to 'mkspecs/features/qt_tool.prf')
| -rw-r--r-- | mkspecs/features/qt_tool.prf | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/mkspecs/features/qt_tool.prf b/mkspecs/features/qt_tool.prf index 56ba1169a1..46d031fb32 100644 --- a/mkspecs/features/qt_tool.prf +++ b/mkspecs/features/qt_tool.prf @@ -37,8 +37,7 @@ load(qt_common) # If we are doing a prefix build, create a "module" pri which enables # qtPrepareTool() to work with the non-installed build. # Non-bootstrapped tools always need this because of the environment setup. -!build_pass:if(!host_build|!force_bootstrap|prefix_build) { - +!build_pass:if(!host_build|!force_bootstrap|force_independent) { isEmpty(MODULE):MODULE = $$TARGET MODULE_DEPENDS = $$replace(QT, -private$, ) |