From 8fd093e47c44f4efc63a80d3ddcdc138afb8230c Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Date: Thu, 21 May 2015 10:15:36 +0200
Subject: support specifying directories in RESOURCES

Change-Id: Ie97b26dd8ccf33d7f2a72bc6a5aec478b196ebb6
Reviewed-by: Rainer Keller <rainer.keller@theqtcompany.com>
Reviewed-by: hjk <hjk@theqtcompany.com>
(cherry picked from commit 4b224816aa2902e10835a560d14e305cfdc32bac)
---
 mkspecs/features/resources.prf | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'mkspecs/features/resources.prf')

diff --git a/mkspecs/features/resources.prf b/mkspecs/features/resources.prf
index 7a38ff8f38..1f04c8b0d7 100644
--- a/mkspecs/features/resources.prf
+++ b/mkspecs/features/resources.prf
@@ -49,9 +49,15 @@ for(resource, RESOURCES) {
 
         for(file, $${resource}.files) {
             abs_path = $$absolute_path($$file, $$_PRO_FILE_PWD_)
-            alias = $$relative_path($$abs_path, $$abs_base)
-            resource_file_content += \
-                "<file alias=\"$$xml_escape($$alias)\">$$xml_escape($$abs_path)</file>"
+            files = $$files($$abs_path/*, true)
+            isEmpty(files): \
+                files = $$abs_path
+            for (file, files) {
+                exists($$file/*): next()  # exclude directories
+                alias = $$relative_path($$file, $$abs_base)
+                resource_file_content += \
+                    "<file alias=\"$$xml_escape($$alias)\">$$xml_escape($$file)</file>"
+            }
         }
 
         resource_file_content += \
-- 
cgit v1.2.3