summaryrefslogtreecommitdiffstats
path: root/src/tools/rcc/rcc.cpp
diff options
context:
space:
mode:
authorhjk <hjk@theqtcompany.com>2015-07-07 15:41:43 +0200
committerhjk <hjk@theqtcompany.com>2015-07-08 14:59:59 +0000
commit32d646d0a6676f5749bc14a51c47838588a7d389 (patch)
treefb9aa5742e0168eb7b4ac59bafe2070959eb8f55 /src/tools/rcc/rcc.cpp
parentb474decee308ef5633af9fffaf4bbe5940a66185 (diff)
Rcc: Do not output empty lines when listing .qrc contents
Previously, directory nodes in the resource tree generated empty file names in the --list output. They do not add value. Change-Id: I04ac495ba5f57802de9796ec663c28facfee89f2 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Simon Warta
Diffstat (limited to 'src/tools/rcc/rcc.cpp')
-rw-r--r--src/tools/rcc/rcc.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/tools/rcc/rcc.cpp b/src/tools/rcc/rcc.cpp
index 71438726f7..7bd1ac0bc6 100644
--- a/src/tools/rcc/rcc.cpp
+++ b/src/tools/rcc/rcc.cpp
@@ -693,7 +693,8 @@ QStringList RCCResourceLibrary::dataFiles() const
RCCFileInfo *child = it.value();
if (child->m_flags & RCCFileInfo::Directory)
pending.push(child);
- ret.append(child->m_fileInfo.filePath());
+ else
+ ret.append(child->m_fileInfo.filePath());
}
}
return ret;