From 3e37c209d2219f32d34df3dab18a94e4af2ae3e6 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 28 Nov 2012 16:17:29 +0100 Subject: remove another pointless indirection MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit we directly expand $$TARGET on the same line, so just do the same with $$VERSION Change-Id: I3601bfcc835b13f63dce43d00cfe8d34ded60b21 Reviewed-by: Tor Arne Vestbø --- mkspecs/features/qt_module.prf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf index 35354fef2a..eeb8f7be53 100644 --- a/mkspecs/features/qt_module.prf +++ b/mkspecs/features/qt_module.prf @@ -66,8 +66,8 @@ MODULE_PRI = $$MODULE_QMAKE_OUTDIR/mkspecs/modules-inst/qt_lib_$${MODULE}.pri module_config = !no_module_headers { MODULE_INCLUDES = "\$\$QT_MODULE_INCLUDE_BASE \$\$QT_MODULE_INCLUDE_BASE/$$MODULE_INCNAME" - MODULE_PRIVATE_INCLUDES = "\$\$QT_MODULE_INCLUDE_BASE/$$MODULE_INCNAME/\$\$QT.$${MODULE}.VERSION \ - \$\$QT_MODULE_INCLUDE_BASE/$$MODULE_INCNAME/\$\$QT.$${MODULE}.VERSION/$$MODULE_INCNAME" + MODULE_PRIVATE_INCLUDES = "\$\$QT_MODULE_INCLUDE_BASE/$$MODULE_INCNAME/$$VERSION \ + \$\$QT_MODULE_INCLUDE_BASE/$$MODULE_INCNAME/$$VERSION/$$MODULE_INCNAME" } MODULE_PRI_CONT = \ "QT.$${MODULE}.VERSION = $${VERSION}" \ -- cgit v1.2.3