diff options
author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-01-03 16:59:36 +0100 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-01-06 20:08:56 +0000 |
commit | cfba3fff052b0af411d21727a68e78ea3e6a21d0 (patch) | |
tree | 9c92475d7570d06c282524ed4e12db15d96a08a1 /configure.pri | |
parent | 20e0bca834a1cae1816f17ef0dbfe8b74192d8dd (diff) | |
download | qtbase-cfba3fff052b0af411d21727a68e78ea3e6a21d0.tar.gz |
move emission of final messages to qmake-based configure
now qmake is the last command called by the unix configure script.
as it happens, this was already the case in the windows script, but only
because it didn't print these messages at all, which it implicitly does
now.
another effect of this is that repositories outside qtbase will now also
get the installation note in modular builds, which makes sense.
Change-Id: I567146936b216185a8e0f61e445222215608bf13
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'configure.pri')
-rw-r--r-- | configure.pri | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/configure.pri b/configure.pri index 1744972f92..3f9a7e208c 100644 --- a/configure.pri +++ b/configure.pri @@ -458,6 +458,10 @@ defineTest(qtConfOutput_prepareSpec) { QMAKESPEC = $$[QT_HOST_DATA/src]/mkspecs/$$XSPEC export(QMAKESPEC) + notes = $$cat($$OUT_PWD/.config.notes, lines) + !isEmpty(notes): \ + qtConfAddNote("Also available for $$notes") + # deviceOptions() below contains conditionals coming form the spec, # so this cannot be delayed for a batch reload. reloadSpec() |