remove over-uses of $$list()

not sure why anyone would do *that* ...

Change-Id: Id91e9e8bd602a9d9275ade2ca86aaa4f4698ff72
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>

diff --git a/src/src.pro b/src/src.pro
index f3f6937..6e1517f 100644 (file)
--- a/src/src.pro
+++ b/src/src.pro
@@ -90,8 +90,8 @@ for(subname, SRC_SUBDIRS) {
    subdir = $$replace(subdir, $$reg_src, $$QT_BUILD_TREE)
    subdir = $$replace(subdir, /, $$QMAKE_DIR_SEP)
    subdir = $$replace(subdir, \\\\, $$QMAKE_DIR_SEP)
-   SUB_TEMPLATE = $$list($$fromfile($$subpro, TEMPLATE))
-   !isEqual(subname, src_tools_bootstrap):if(isEqual($$SUB_TEMPLATE, lib) | isEqual($$SUB_TEMPLATE, subdirs)):!separate_debug_info {
+   SUB_TEMPLATE = $$fromfile($$subpro, TEMPLATE)
+   !isEqual(subname, src_tools_bootstrap):if(isEqual(SUB_TEMPLATE, lib) | isEqual(SUB_TEMPLATE, subdirs)):!separate_debug_info {
        #debug
        debug-$${subtarget}.depends = $${subdir}$${QMAKE_DIR_SEP}$(MAKEFILE) $$EXTRA_DEBUG_TARGETS
        debug-$${subtarget}.commands = (cd $$subdir && $(MAKE) -f $(MAKEFILE) debug)

diff --git a/src/tools/tools.pro b/src/tools/tools.pro
index e6b9eef..cf10163 100644 (file)
--- a/src/tools/tools.pro
+++ b/src/tools/tools.pro
@@ -32,8 +32,8 @@ for(subname, TOOLS_SUBDIRS) {
     subdir = $$replace(subdir, $$reg_src, $$QT_BUILD_TREE)
     subdir = $$replace(subdir, /, $$QMAKE_DIR_SEP)
     subdir = $$replace(subdir, \\\\, $$QMAKE_DIR_SEP)
-    SUB_TEMPLATE = $$list($$fromfile($$subpro, TEMPLATE))
-    !isEqual(subname, src_tools_bootstrap):if(isEqual($$SUB_TEMPLATE, lib) | isEqual($$SUB_TEMPLATE, subdirs)):!separate_debug_info {
+    SUB_TEMPLATE = $$fromfile($$subpro, TEMPLATE)
+    !isEqual(subname, src_tools_bootstrap):if(isEqual(SUB_TEMPLATE, lib) | isEqual(SUB_TEMPLATE, subdirs)):!separate_debug_info {
         #debug
         debug-$${subtarget}.depends = $${subdir}$${QMAKE_DIR_SEP}$(MAKEFILE) $$EXTRA_DEBUG_TARGETS
         debug-$${subtarget}.commands = (cd $$subdir && $(MAKE) -f $(MAKEFILE) debug)