Make listing of resources less verbose

Print the resources only once, and hide Qt internal resource paths.

Change-Id: I4fce72424b4ab94d44d63e16b6ae89cff7ccac72
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>

1 files changed, 9 insertions, 10 deletions

diff --git a/src/sdk/installerbase.cpp b/src/sdk/installerbase.cpp
index d7988418d..fe71dc2ac 100644
--- a/src/sdk/installerbase.cpp
+++ b/src/sdk/installerbase.cpp
@@ -276,15 +276,8 @@ int main(int argc, char *argv[])
         if (QInstaller::isVerbose()) {
             qDebug() << VERSION;
             qDebug() << "Arguments:" << app.arguments();
-            qDebug() << "Resource tree before loading the in-binary resource:";
             qDebug() << "Language: " << QLocale().uiLanguages().value(0,
                 QLatin1String("No UI language set"));
-
-            QDirIterator it(QLatin1String(":/"),
-                QDir::NoDotAndDotDot | QDir::AllEntries | QDir::Hidden,
-                QDirIterator::Subdirectories);
-            while (it.hasNext())
-                qDebug() << QString::fromLatin1("    %1").arg(it.next());
         }
 
         BinaryContent content = BinaryContent::readAndRegisterFromBinary(app.binaryFile());
@@ -365,11 +358,17 @@ int main(int argc, char *argv[])
             content.registerAsDefaultQResource(newDefaultResource);
 
         if (QInstaller::isVerbose()) {
-            qDebug() << "Resource tree after loading the in-binary resource:";
+            qDebug() << "Resource tree:";
             QDirIterator it(QLatin1String(":/"), QDir::NoDotAndDotDot | QDir::AllEntries | QDir::Hidden,
                 QDirIterator::Subdirectories);
-            while (it.hasNext())
-                qDebug() << QString::fromLatin1("    %1").arg(it.next());
+            while (it.hasNext()) {
+                const QString path = it.next();
+                if (path.startsWith(QLatin1String(":/trolltech"))
+                        || path.startsWith(QLatin1String(":/qt-project.org"))) {
+                    continue;
+                }
+                qDebug() << "    " << it.next().toUtf8().constData();
+            }
         }
 
         const QString directory = QLatin1String(":/translations");