diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-06-28 16:00:13 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-07-03 15:31:13 +0200 |
| commit | de54d7bb2955356feb707fd1583840e090696625 (patch) | |
| tree | 5611945e2df7fba9fab0e2d411277165955d44bb | |
| parent | 215f137e29ad9176fa1a5d4c446115379f5dbc0d (diff) | |
headersclean: process private modules correctly
Change-Id: I51c8ee0db31b35e1d991411fe0b03da6665e9a84
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| -rw-r--r-- | mkspecs/features/qt_headersclean.prf | 3 | ||||
| -rw-r--r-- | 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 4128392997..ab0a722628 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 4965064b88..73e0c5dd56 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 |