From 2c8ebbc25bc55ba780ee3c09c62d3edc55eb3f25 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 29 Nov 2012 22:22:42 +0100 Subject: make it possible to name include dir differently from library name MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ActiveQt needs that Change-Id: Ib9f69d19e8042c1ab0f211eebb9237bc2fb77aa3 Reviewed-by: Tor Arne Vestbø --- mkspecs/features/qt_module_headers.prf | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'mkspecs/features/qt_module_headers.prf') diff --git a/mkspecs/features/qt_module_headers.prf b/mkspecs/features/qt_module_headers.prf index b1918bd67d..bbe86d1895 100644 --- a/mkspecs/features/qt_module_headers.prf +++ b/mkspecs/features/qt_module_headers.prf @@ -4,16 +4,16 @@ load(qt_build_paths) qtPrepareTool(QMAKE_SYNCQT, syncqt) contains(QT_CONFIG, private_tests): \ # -developer-build QMAKE_SYNCQT += -check-includes - QMAKE_SYNCQT += -module $$TARGET -mkspecsdir $$[QT_HOST_DATA/get]/mkspecs -outdir $$MODULE_BASE_OUTDIR $$MODULE_BASE_DIR + QMAKE_SYNCQT += -module $$MODULE_INCNAME -mkspecsdir $$[QT_HOST_DATA/get]/mkspecs -outdir $$MODULE_BASE_OUTDIR $$MODULE_BASE_DIR !silent: message($$QMAKE_SYNCQT) system($$QMAKE_SYNCQT)|error("Failed to run: $$QMAKE_SYNCQT") } #load up the headers info -include($$MODULE_BASE_OUTDIR/include/$$TARGET/headers.pri, "", true) +include($$MODULE_BASE_OUTDIR/include/$$MODULE_INCNAME/headers.pri, "", true) -lctarget = $$lower($$TARGET) -uctarget = $$upper($$TARGET) +lctarget = $$lower($$MODULE_INCNAME) +uctarget = $$upper($$MODULE_INCNAME) defineTest(shouldMasterInclude) { bn = $$basename(1) @@ -51,7 +51,7 @@ count(MODULE_VERSION_HEADER, 1) { } # Create a module master header -MODULE_MASTER_HEADER = $$MODULE_BASE_OUTDIR/include/$$TARGET/$$TARGET +MODULE_MASTER_HEADER = $$MODULE_BASE_OUTDIR/include/$$MODULE_INCNAME/$$MODULE_INCNAME !build_pass { MODULE_MASTER_HEADER_CONT = \ "/* This file was generated by qmake with the info from $${_PRO_FILE_}. */" \ -- cgit v1.2.3