From 2d22e737757c959fff103a4a99fbd896ef09597b Mon Sep 17 00:00:00 2001
From: Andrew Knight <andrew.knight@digia.com>
Date: Fri, 14 Feb 2014 13:25:42 +0200
Subject: WinRT package_manifest: Remove comment about manifest overwrite

This comment is wrong and should be removed. The manifest is always
generated.

Change-Id: I281737dd6a358380fb557063eadae88909f5078b
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
---
 mkspecs/common/winrt_winphone/manifests/8.0/AppxManifest.xml.in  | 2 +-
 mkspecs/common/winrt_winphone/manifests/8.0/WMAppManifest.xml.in | 2 +-
 mkspecs/common/winrt_winphone/manifests/8.1/AppxManifest.xml.in  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'mkspecs')

diff --git a/mkspecs/common/winrt_winphone/manifests/8.0/AppxManifest.xml.in b/mkspecs/common/winrt_winphone/manifests/8.0/AppxManifest.xml.in
index 6a0ca444c3..42bac8b8b1 100644
--- a/mkspecs/common/winrt_winphone/manifests/8.0/AppxManifest.xml.in
+++ b/mkspecs/common/winrt_winphone/manifests/8.0/AppxManifest.xml.in
@@ -36,4 +36,4 @@
   <Capabilities>$${WINRT_MANIFEST.capabilities}</Capabilities>
   <Dependencies>$${WINRT_MANIFEST.dependencies}</Dependencies>
 </Package>
-<!-- Generated by qmake using the $$[QMAKE_XSPEC] mkspec. Remove this line to prevent this file from getting overwritten by qmake. -->
+<!-- Generated by qmake using the $$[QMAKE_XSPEC] mkspec. -->
diff --git a/mkspecs/common/winrt_winphone/manifests/8.0/WMAppManifest.xml.in b/mkspecs/common/winrt_winphone/manifests/8.0/WMAppManifest.xml.in
index e1d3d071e9..968f42fa06 100644
--- a/mkspecs/common/winrt_winphone/manifests/8.0/WMAppManifest.xml.in
+++ b/mkspecs/common/winrt_winphone/manifests/8.0/WMAppManifest.xml.in
@@ -36,4 +36,4 @@
     </ScreenResolutions>
   </App>
 </Deployment>
-<!-- Generated by qmake using the $$[QMAKE_XSPEC] mkspec. Remove this line to prevent this file from getting overwritten by qmake. -->
+<!-- Generated by qmake using the $$[QMAKE_XSPEC] mkspec. -->
diff --git a/mkspecs/common/winrt_winphone/manifests/8.1/AppxManifest.xml.in b/mkspecs/common/winrt_winphone/manifests/8.1/AppxManifest.xml.in
index 8c214871e3..fcc4d75b0f 100644
--- a/mkspecs/common/winrt_winphone/manifests/8.1/AppxManifest.xml.in
+++ b/mkspecs/common/winrt_winphone/manifests/8.1/AppxManifest.xml.in
@@ -41,4 +41,4 @@
   <Capabilities>$${WINRT_MANIFEST.capabilities}</Capabilities>
   <Dependencies>$${WINRT_MANIFEST.dependencies}</Dependencies>
 </Package>
-<!-- Generated by qmake using the $$[QMAKE_XSPEC] mkspec. Remove this line to prevent this file from getting overwritten by qmake. -->
+<!-- Generated by qmake using the $$[QMAKE_XSPEC] mkspec. -->
-- 
cgit v1.2.3


From f8c5dd9857211601e2ea4b704df92e240b2c3b4b Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Date: Mon, 3 Feb 2014 22:22:14 +0100
Subject: automate handling of generated headers some more

let the syncqt + qt_module_header.prf pair handle generation of
forwarding headers.

in qtbase this is ineffective to some degree, as the need to create
QtCore's forwarding headers early for QtBootstrap requires qtbase.pro
already doing the real work, but at least we get the verification that
nothing breaks.
Other Modules (TM) will need the full functionality.

Change-Id: Ifd3dfa05c4c8a91698a365160edb6dabc84e553f
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
---
 mkspecs/features/qt_module_headers.prf | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'mkspecs')

diff --git a/mkspecs/features/qt_module_headers.prf b/mkspecs/features/qt_module_headers.prf
index ca26eb674b..0baa9ec7b2 100644
--- a/mkspecs/features/qt_module_headers.prf
+++ b/mkspecs/features/qt_module_headers.prf
@@ -35,6 +35,20 @@ else: \
     INC_PATH = $$MODULE_BASE_INDIR
 include($$INC_PATH/include/$$MODULE_INCNAME/headers.pri, "", true)
 
+for (injection, SYNCQT.INJECTIONS) {
+    injects = $$split(injection, :)
+    fwd_hdr = $$member(injects, 1)
+    MAIN_FWD = $$INC_PATH/include/$$MODULE_INCNAME/$$fwd_hdr
+    MAIN_FWD_CONT = '$${LITERAL_HASH}include "$$member(injects, 0)"'
+    write_file($$MAIN_FWD, MAIN_FWD_CONT)|error("Aborting.")
+    injects = $$member(injects, 2, -1)
+    for (inject, injects) {
+        CLASS_FWD = $$INC_PATH/include/$$MODULE_INCNAME/$$inject
+        CLASS_FWD_CONT = '$${LITERAL_HASH}include "$$fwd_hdr"'
+        write_file($$CLASS_FWD, CLASS_FWD_CONT)|error("Aborting.")
+    }
+}
+
 autogen_warning = \
     "/* This file was generated by qmake with the info from <root>/$$relative_path($$_PRO_FILE_, $$MODULE_BASE_INDIR). */"
 
-- 
cgit v1.2.3