diff options
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/qt.prf | 3 | ||||
| -rw-r--r-- | mkspecs/features/qt_functions.prf | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf index c65be4c456..8af10b143d 100644 --- a/mkspecs/features/qt.prf +++ b/mkspecs/features/qt.prf @@ -149,6 +149,7 @@ for(QTLIB, QT) { NEWQT += $$eval(QT.$${QTLIBRAW}.private_depends) } NEWQT += $$QTLIBRAW + contains(QT.$${QTLIBRAW}.CONFIG, auto_use_privates): CONFIG += auto_use_privates } # Topological resolution of modules based on their QT.<module>.depends variable QT = $$resolve_depends(NEWQT, "QT.") @@ -170,7 +171,7 @@ for(QTLIB, QT) { } !isEmpty(BAD_QT):error("Unknown module(s) in QT: $$BAD_QT") -!isEmpty(using_privates):!no_private_qt_headers_warning:if(!debug_and_release|!build_pass) { +!isEmpty(using_privates):!auto_use_privates:!no_private_qt_headers_warning:if(!debug_and_release|!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!") diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf index dcd374b2ad..ce6d9e414b 100644 --- a/mkspecs/features/qt_functions.prf +++ b/mkspecs/features/qt_functions.prf @@ -51,7 +51,7 @@ defineTest(qtAddModule) { } INCLUDEPATH *= $$MODULE_INCLUDES - isEqual(2, UsePrivate) { # Tests function parameter 2 ($$2) being equal to 'UsePrivate' + auto_use_privates|isEqual(2, UsePrivate) { # Tests function parameter 2 ($$2) being equal to 'UsePrivate' # This adds both # <module privates include path>/ # and <module privates include path>/<module name> |