From 6bea0398eadb08c69727dd2ec8919aa4e5f98b07 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 12 Oct 2018 15:51:38 +0200 Subject: configure: fix bogus message about not needing to install qt when building additional modules against an already installed qtbase, $$[QT_INSTALL_PREFIX/get] is obviously the same as $$[QT_INSTALL_PREFIX], so we would misdiagnose a non-prefix build. instead, use the same condition as qt_build_config.prf (we cannot just rely on what it sets, because in qtbase configure context it's evaluated before we set up the paths). Fixes: QTBUG-60541 Change-Id: I37be30e0e682ece76ed460a66f1984ee0fe2ed71 Reviewed-by: Thiago Macieira Reviewed-by: Oswald Buddenhagen --- mkspecs/features/qt_configure.prf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf index 2cc6b49d3c..65ee7df50b 100644 --- a/mkspecs/features/qt_configure.prf +++ b/mkspecs/features/qt_configure.prf @@ -2215,7 +2215,7 @@ qtConfPrintReport() logn() logn("Qt is now configured for building. Just run '$$QMAKE_MAKE_NAME'.") pfx = $$[QT_INSTALL_PREFIX] -equals(pfx, $$[QT_INSTALL_PREFIX/get]) { +exists($$pfx/.qmake.cache) { logn("Once everything is built, Qt is installed.") logn("You should NOT run '$$QMAKE_MAKE_NAME install'.") logn("Note that this build cannot be deployed to other machines or devices.") -- cgit v1.2.3