configure: turn qtConfOutputPostProcess_*() callbacks into replace functions

now the callbacks don't need to re-export the designated file contents,
which improves the abstraction and removes some boilerplate.

Change-Id: Ifa50313155fc96762025e2610b810ebb71daa373
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

1 files changed, 9 insertions, 5 deletions

diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf
index c984206f0d..289e2250bd 100644
--- a/mkspecs/features/qt_configure.prf
+++ b/mkspecs/features/qt_configure.prf
@@ -1672,13 +1672,17 @@ defineTest(qtConfProcessOutput) {
             }
         }
 
-        ppScope =
-        !isEmpty(module): ppScope = $${module}_
-        defined(qtConfOutputPostProcess_$${ppScope}$${type}, test): \
-            qtConfOutputPostProcess_$${ppScope}$${type}()
+        content = $$eval($${currentConfig}.output.$${type})
+
+        !isEmpty(module): \
+            call = qtConfOutputPostProcess_$${module}_$${type}
+        else: \
+            call = qtConfOutputPostProcess_$${type}
+        defined($$call, replace): \
+            eval(content = \$\$"$$call"(\$\$content))
 
         file = $$eval($${currentConfig}.files.$${type})
-        fileCont.$$file += $$eval($${currentConfig}.output.$${type})
+        fileCont.$$file += $$content
         fileCont._KEYS_ *= $$file
     }