From 4485f0d626c44ca21e8dff6e336bbd99fdae6761 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Fri, 23 Oct 2020 11:38:30 +0200 Subject: [PATCH] qmake: Don't warn about using private headers if there are none Change-Id: I1d9ab0b4d25671931faa469e66cb2beb7bd846fd Reviewed-by: Alexandru Croitor --- mkspecs/features/qt.prf | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf index 532a241fc0e..c1691a7894a 100644 --- a/mkspecs/features/qt.prf +++ b/mkspecs/features/qt.prf @@ -169,7 +169,7 @@ defineTest(qtProcessModuleFlags) { export($$1) } -unset(using_privates) +unset(using_private_headers) var_sfx = for(ever) { # Topological resolution of modules based on their QT..depends variable @@ -190,8 +190,8 @@ for(ever) { next() } - contains(MODULE_CONFIG, internal_module): \ - using_privates = true + contains(MODULE_CONFIG, internal_module):!isEmpty(MODULE_INCLUDES): \ + using_private_headers = true contains(MODULE_CONFIG, ltcg): \ CONFIG += link_ltcg @@ -246,7 +246,7 @@ for(ever) { !isEmpty(var_sfx): break() var_sfx = _PRIVATE } -!isEmpty(using_privates):!no_private_qt_headers_warning:!build_pass { +!isEmpty(using_private_headers):!no_private_qt_headers_warning:!build_pass { message("This project is using private headers and will therefore be tied to this specific Qt module build version.") message("Running this project against other versions of the Qt modules may crash at any arbitrary point.") message("This is not a bug, but a result of using Qt internals. You have been warned!")