From de54d7bb2955356feb707fd1583840e090696625 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 28 Jun 2013 16:00:13 +0200 Subject: [PATCH] headersclean: process private modules correctly Change-Id: I51c8ee0db31b35e1d991411fe0b03da6665e9a84 Reviewed-by: Joerg Bornemann --- mkspecs/features/qt_headersclean.prf | 3 ++- tests/auto/other/headersclean/headersclean.pro | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/mkspecs/features/qt_headersclean.prf b/mkspecs/features/qt_headersclean.prf index 4128392997e..ab0a7226286 100644 --- a/mkspecs/features/qt_headersclean.prf +++ b/mkspecs/features/qt_headersclean.prf @@ -36,7 +36,8 @@ TARGET = tst_headersclean includes = for(q, QT) { - qn = $$eval(QT.$${q}.name) + sq = $$replace(q, -private\$, ) + qn = $$eval(QT.$${sq}.name) isEmpty(qn): \ QT -= $$q else: \ diff --git a/tests/auto/other/headersclean/headersclean.pro b/tests/auto/other/headersclean/headersclean.pro index 4965064b88d..73e0c5dd561 100644 --- a/tests/auto/other/headersclean/headersclean.pro +++ b/tests/auto/other/headersclean/headersclean.pro @@ -1,3 +1,3 @@ -QT = core concurrent network dbus xml sql testlib gui opengl widgets printsupport platformsupport +QT = core concurrent network dbus xml sql testlib gui opengl widgets printsupport platformsupport-private load(qt_headersclean) DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0