From 34cb86d46b5cebed14bbb8c5e4143447025e9094 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 25 Jun 2012 17:18:26 +0200 Subject: make using testlib automatically "promote" all modules to -private autotests often need private headers (especially with qpa headers now being private) and have no compatibility requirements, so it makes sense to just use the privates of requested modules. this also suppresses the useless warning about using privates, in case they are still explicitly specified. Change-Id: I9e499bedcf6ef25777283ff1432cef7254e9093a Reviewed-by: Girish Ramakrishnan --- mkspecs/features/qt.prf | 3 ++- mkspecs/features/qt_functions.prf | 2 +- src/testlib/testlib.pro | 2 +- 3 files changed, 4 insertions(+), 3 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..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 # / # and / diff --git a/src/testlib/testlib.pro b/src/testlib/testlib.pro index f77a611e25..b90171722c 100644 --- a/src/testlib/testlib.pro +++ b/src/testlib/testlib.pro @@ -4,7 +4,7 @@ TARGET = QtTest QT = core-private CONFIG += exceptions -MODULE_CONFIG = console testlib_defines +MODULE_CONFIG = console testlib_defines auto_use_privates INCLUDEPATH += . unix:!embedded:QMAKE_PKGCONFIG_DESCRIPTION = Qt \ -- cgit v1.2.3