From 96557bc389794abdcb15305c2a439f344ec2f0c3 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Date: Tue, 28 May 2013 20:57:07 +0200
Subject: move module master header generation back to syncqt

now that we split out the part that depends on the project file, we can
do it cleanly here.
this way we can generate these headers at pre-build time already.
and for git builds, perl is probably faster than qmake at this task.

Change-Id: I343255c6de22329471a3ae2c2aac9ebeb160a501
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
---
 mkspecs/features/qt_module_headers.prf | 25 -------------------------
 1 file changed, 25 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 65e9a888f3..7591bffb19 100644
--- a/mkspecs/features/qt_module_headers.prf
+++ b/mkspecs/features/qt_module_headers.prf
@@ -31,15 +31,6 @@ minimal_syncqt: return()
 #load up the headers info
 include($$MODULE_BASE_OUTDIR/include/$$MODULE_INCNAME/headers.pri, "", true)
 
-defineTest(shouldMasterInclude) {
-    bn = $$basename(1)
-    contains(bn, .*_.*):return(false)
-    contains(bn, ^qconfig.*):return(false)
-    lines = $$cat($$_PRO_FILE_PWD_/$$1, lines)
-    contains(lines, $${LITERAL_HASH}pragma qt_no_master_include):return(false)
-    return(true)
-}
-
 autogen_warning = \
     "/* This file was generated by qmake with the info from <root>/$$relative_path($$_PRO_FILE_, $$MODULE_BASE_DIR). */"
 
@@ -55,20 +46,4 @@ MODULE_MASTER_DEPS_HEADER = $$MODULE_BASE_OUTDIR/include/$$MODULE_INCNAME/$${MOD
 }
 SYNCQT.HEADER_FILES += $$MODULE_MASTER_DEPS_HEADER
 
-# Create a module master header
-MODULE_MASTER_HEADER = $$MODULE_BASE_OUTDIR/include/$$MODULE_INCNAME/$$MODULE_INCNAME
-!build_pass {
-    MODULE_MASTER_HEADER_CONT = \
-        $$autogen_warning \
-        "$${LITERAL_HASH}ifndef QT_$${ucmodule}_MODULE_H" \
-        "$${LITERAL_HASH}define QT_$${ucmodule}_MODULE_H" \
-        "$${LITERAL_HASH}include <$$MODULE_INCNAME/$${MODULE_INCNAME}Depends>"
-    for(hdr, SYNCQT.HEADER_FILES): \
-        shouldMasterInclude($$hdr): \
-            MODULE_MASTER_HEADER_CONT += "$${LITERAL_HASH}include \"$$replace(hdr, .*/, )\""
-    MODULE_MASTER_HEADER_CONT += "$${LITERAL_HASH}endif"
-    write_file($$MODULE_MASTER_HEADER, MODULE_MASTER_HEADER_CONT)|error("Aborting.")
-}
-SYNCQT.HEADER_FILES += $$MODULE_MASTER_HEADER
-
 CONFIG += qt_install_headers
-- 
cgit v1.2.3